summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0030/disco.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-09-30 17:15:13 -0700
committerLance Stout <lancestout@gmail.com>2012-09-30 17:15:13 -0700
commit44e7585bf8c7715eb0eaf348976b4c0fc0568722 (patch)
treed9c271b2013371e653d18d8ea4db13b17c670c7b /sleekxmpp/plugins/xep_0030/disco.py
parenta2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3 (diff)
parent94488fa2ea4dac7ff6fce20621d2e80e700f6299 (diff)
downloadslixmpp-44e7585bf8c7715eb0eaf348976b4c0fc0568722.tar.gz
slixmpp-44e7585bf8c7715eb0eaf348976b4c0fc0568722.tar.bz2
slixmpp-44e7585bf8c7715eb0eaf348976b4c0fc0568722.tar.xz
slixmpp-44e7585bf8c7715eb0eaf348976b4c0fc0568722.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0030/disco.py')
0 files changed, 0 insertions, 0 deletions