summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0054
diff options
context:
space:
mode:
authorRobert Robinson <rerobins@gmail.com>2015-09-18 13:35:28 -0600
committerRobert Robinson <rerobins@gmail.com>2015-09-18 13:35:28 -0600
commitc2dc44cfd17d24f7737113efb4e0e9cab5d7d09f (patch)
treed7a08ff192eac6e341e66891a0ded70ebd0e238f /sleekxmpp/plugins/xep_0054
parent5fc14de32e7fbd4e33a0e1ed92d8fb23871a2a2d (diff)
parentffb2b6bc0464a9646d4b4bca3943d3a89dfc13a6 (diff)
downloadslixmpp-c2dc44cfd17d24f7737113efb4e0e9cab5d7d09f.tar.gz
slixmpp-c2dc44cfd17d24f7737113efb4e0e9cab5d7d09f.tar.bz2
slixmpp-c2dc44cfd17d24f7737113efb4e0e9cab5d7d09f.tar.xz
slixmpp-c2dc44cfd17d24f7737113efb4e0e9cab5d7d09f.zip
Merge branch 'develop' into xep_0050_updates
# Conflicts: # tests/test_stream_xep_0050.py
Diffstat (limited to 'sleekxmpp/plugins/xep_0054')
0 files changed, 0 insertions, 0 deletions