summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0115/caps.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-07 16:45:20 -0700
committerLance Stout <lancestout@gmail.com>2012-08-07 16:45:20 -0700
commit14aa8311690f3a58ff4b7ad286bcccdd867789f7 (patch)
tree311b4e7e83fb51386b417d070a16c8757aa958de /sleekxmpp/plugins/xep_0115/caps.py
parent75d904ed01921eaa95ba3cd22c4740d77729913d (diff)
parent295d23ccf37860245d0e86b38a3a2315532f2972 (diff)
downloadslixmpp-14aa8311690f3a58ff4b7ad286bcccdd867789f7.tar.gz
slixmpp-14aa8311690f3a58ff4b7ad286bcccdd867789f7.tar.bz2
slixmpp-14aa8311690f3a58ff4b7ad286bcccdd867789f7.tar.xz
slixmpp-14aa8311690f3a58ff4b7ad286bcccdd867789f7.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0115/caps.py')
0 files changed, 0 insertions, 0 deletions