diff options
author | Lance Stout <lancestout@gmail.com> | 2012-06-20 23:46:13 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2012-06-20 23:46:13 -0700 |
commit | eb5df1aa3722e6e85b9683805b4088f4340918aa (patch) | |
tree | b2d0989f71dc0be91d22c3221b4be5d1918e1881 /sleekxmpp/plugins/xep_0115/__init__.py | |
parent | 546066d67713db06400f4c74814875d47d98670e (diff) | |
parent | 8a745c5e8101ee80fff88cf93e969fec5507ba2d (diff) | |
download | slixmpp-eb5df1aa3722e6e85b9683805b4088f4340918aa.tar.gz slixmpp-eb5df1aa3722e6e85b9683805b4088f4340918aa.tar.bz2 slixmpp-eb5df1aa3722e6e85b9683805b4088f4340918aa.tar.xz slixmpp-eb5df1aa3722e6e85b9683805b4088f4340918aa.zip |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0115/__init__.py')
0 files changed, 0 insertions, 0 deletions