summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0030/disco.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-03-23 10:01:21 -0400
committerLance Stout <lancestout@gmail.com>2011-03-23 10:01:21 -0400
commit694673b9bdc108ae109efd4dafa8893a22952b94 (patch)
tree41e8ca2ea185a3cd7032764b0d911b2850ebbe1a /sleekxmpp/plugins/xep_0030/disco.py
parent306bdd802140b65957aed7a3f5d384ccbf02f61a (diff)
parentf2449009d197e8e6f29caff6b78a9c9c87ae2909 (diff)
downloadslixmpp-694673b9bdc108ae109efd4dafa8893a22952b94.tar.gz
slixmpp-694673b9bdc108ae109efd4dafa8893a22952b94.tar.bz2
slixmpp-694673b9bdc108ae109efd4dafa8893a22952b94.tar.xz
slixmpp-694673b9bdc108ae109efd4dafa8893a22952b94.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/plugins/xep_0030/disco.py')
0 files changed, 0 insertions, 0 deletions