summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0050
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-07-26 12:24:34 -0700
committerLance Stout <lancestout@gmail.com>2012-07-26 12:24:34 -0700
commitc9b2cf60431f415584c1d12a7855e0d2ac148ec4 (patch)
tree2589aff4273b00e75a01235fda28a7641669ba55 /sleekxmpp/plugins/xep_0050
parent16ec0f151a18030a948038aa6eca1f9f1b488928 (diff)
parent35396d2977f9b19f6690b88a7c2f3c7f4f09356b (diff)
downloadslixmpp-c9b2cf60431f415584c1d12a7855e0d2ac148ec4.tar.gz
slixmpp-c9b2cf60431f415584c1d12a7855e0d2ac148ec4.tar.bz2
slixmpp-c9b2cf60431f415584c1d12a7855e0d2ac148ec4.tar.xz
slixmpp-c9b2cf60431f415584c1d12a7855e0d2ac148ec4.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0050')
0 files changed, 0 insertions, 0 deletions