summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0060.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-04-26 16:33:42 -0400
committerLance Stout <lancestout@gmail.com>2011-04-26 16:33:42 -0400
commitb1439df72aedec0d96642531edfdc9e3ca8ea673 (patch)
tree222bca89790fa8c1a735d3f30de5255b7d0ca855 /sleekxmpp/plugins/xep_0060.py
parentea8c40c7b637d656a596e16555a0d8695932a06f (diff)
parent5399fdd3a95377bfb5bba993f299664557cabb7c (diff)
downloadslixmpp-b1439df72aedec0d96642531edfdc9e3ca8ea673.tar.gz
slixmpp-b1439df72aedec0d96642531edfdc9e3ca8ea673.tar.bz2
slixmpp-b1439df72aedec0d96642531edfdc9e3ca8ea673.tar.xz
slixmpp-b1439df72aedec0d96642531edfdc9e3ca8ea673.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/plugins/xep_0060.py')
0 files changed, 0 insertions, 0 deletions