summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0060.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-04-08 16:42:02 -0400
committerLance Stout <lancestout@gmail.com>2011-04-08 16:42:02 -0400
commitae5ce170355de59cfd7913f85f7444f2f92bf21a (patch)
treed6308ab53b27d636956086afe44ef8213c99de91 /sleekxmpp/plugins/xep_0060.py
parentf125c11a810cf308473394262879f94166c3f564 (diff)
parent2e1befc8c6e3092b773a8c297bc183823c2eaeed (diff)
downloadslixmpp-ae5ce170355de59cfd7913f85f7444f2f92bf21a.tar.gz
slixmpp-ae5ce170355de59cfd7913f85f7444f2f92bf21a.tar.bz2
slixmpp-ae5ce170355de59cfd7913f85f7444f2f92bf21a.tar.xz
slixmpp-ae5ce170355de59cfd7913f85f7444f2f92bf21a.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/plugins/xep_0060.py')
0 files changed, 0 insertions, 0 deletions