diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-06-19 21:50:33 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-06-19 21:50:33 -0700 |
| commit | 5820d49cd401a1362a8a675c4b91935adb1240fe (patch) | |
| tree | f40f78839ae3004bfb0b8da1ae93d61759d8ad66 /tests/test_stanza_xep_0060.py | |
| parent | 1ab66e576786ecb0cfb9b6b163811735564b951b (diff) | |
| parent | 36c11ad9de7c1b5a199aa5a4302e33085513c126 (diff) | |
| download | slixmpp-5820d49cd401a1362a8a675c4b91935adb1240fe.tar.gz slixmpp-5820d49cd401a1362a8a675c4b91935adb1240fe.tar.bz2 slixmpp-5820d49cd401a1362a8a675c4b91935adb1240fe.tar.xz slixmpp-5820d49cd401a1362a8a675c4b91935adb1240fe.zip | |
Merge branch 'master' into develop
Conflicts:
sleekxmpp/basexmpp.py
Diffstat (limited to 'tests/test_stanza_xep_0060.py')
0 files changed, 0 insertions, 0 deletions