diff options
author | Lance Stout <lancestout@gmail.com> | 2011-02-24 16:19:45 -0500 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-02-24 16:19:45 -0500 |
commit | 42c8f6ae877535c48424e5bcb8233f5d07dcfb7d (patch) | |
tree | 5d6892cfd29cb009b952bc06b398bd8cf03ac541 /tests/test_stanza_xep_0060.py | |
parent | e4f3b777f9d6c57a2d05296079828609e6b18375 (diff) | |
parent | 45ccb313560fbfbc0354ebac9116ecb9ff963a47 (diff) | |
download | slixmpp-42c8f6ae877535c48424e5bcb8233f5d07dcfb7d.tar.gz slixmpp-42c8f6ae877535c48424e5bcb8233f5d07dcfb7d.tar.bz2 slixmpp-42c8f6ae877535c48424e5bcb8233f5d07dcfb7d.tar.xz slixmpp-42c8f6ae877535c48424e5bcb8233f5d07dcfb7d.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'tests/test_stanza_xep_0060.py')
0 files changed, 0 insertions, 0 deletions