diff options
author | Lance Stout <lancestout@gmail.com> | 2012-10-31 00:17:26 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2012-10-31 00:17:26 -0700 |
commit | a00eee1bbee83b2435b09be6c4175c3649fa797b (patch) | |
tree | 42ca01bf2daba33df5077ca04f8b8a9b416698e3 /sleekxmpp/plugins/xep_0050/adhoc.py | |
parent | 06a690a2592cba388877391935ed4168d101a231 (diff) | |
parent | 12e8bb6ddcd686ec9835ba478a112984e65120a1 (diff) | |
download | slixmpp-a00eee1bbee83b2435b09be6c4175c3649fa797b.tar.gz slixmpp-a00eee1bbee83b2435b09be6c4175c3649fa797b.tar.bz2 slixmpp-a00eee1bbee83b2435b09be6c4175c3649fa797b.tar.xz slixmpp-a00eee1bbee83b2435b09be6c4175c3649fa797b.zip |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0050/adhoc.py')
0 files changed, 0 insertions, 0 deletions