diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-06-15 10:57:25 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-06-15 10:57:25 -0700 |
| commit | e4b3a191d6b52c1e11f2a125ae9b71bc7ba6d8d7 (patch) | |
| tree | 09e761c1218b31d4b92fa91eab5659004103a5d8 /conn_tests/testpubsub.py | |
| parent | a3597d6debfbe6b070782d1744bc0a8ee305e574 (diff) | |
| parent | 58aa944a5e07032fc8d5770347f82e7c2ce6c948 (diff) | |
| download | slixmpp-e4b3a191d6b52c1e11f2a125ae9b71bc7ba6d8d7.tar.gz slixmpp-e4b3a191d6b52c1e11f2a125ae9b71bc7ba6d8d7.tar.bz2 slixmpp-e4b3a191d6b52c1e11f2a125ae9b71bc7ba6d8d7.tar.xz slixmpp-e4b3a191d6b52c1e11f2a125ae9b71bc7ba6d8d7.zip | |
Merge branch 'develop' into roster
Conflicts:
sleekxmpp/basexmpp.py
Diffstat (limited to 'conn_tests/testpubsub.py')
0 files changed, 0 insertions, 0 deletions