summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0030/disco.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-03-22 12:08:27 -0400
committerLance Stout <lancestout@gmail.com>2011-03-22 12:08:27 -0400
commita9685a00b304aa136ffd0681ed3b92126e05ecae (patch)
tree2f51c7cde0e2314c6ef63686f7fdb4f1bfcc06a3 /sleekxmpp/plugins/xep_0030/disco.py
parentaf45b51f4fe32b37e80e51dea66b9fd0ca3d8ad2 (diff)
parent86a6b40fd81daa7d0e976dbc63f33544060c75d1 (diff)
downloadslixmpp-a9685a00b304aa136ffd0681ed3b92126e05ecae.tar.gz
slixmpp-a9685a00b304aa136ffd0681ed3b92126e05ecae.tar.bz2
slixmpp-a9685a00b304aa136ffd0681ed3b92126e05ecae.tar.xz
slixmpp-a9685a00b304aa136ffd0681ed3b92126e05ecae.zip
Merge branch 'develop' into stream_features
Conflicts: sleekxmpp/clientxmpp.py
Diffstat (limited to 'sleekxmpp/plugins/xep_0030/disco.py')
0 files changed, 0 insertions, 0 deletions