diff options
author | Lance Stout <lancestout@gmail.com> | 2014-04-20 18:10:22 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2014-04-20 18:10:22 -0700 |
commit | ef2f5d29788218f679cd878e4e25bbd61545fef4 (patch) | |
tree | e65f1cd10ddc618101c21acfe264f74037fb6450 /sleekxmpp/test/livesocket.py | |
parent | 62671e0f56c0c24bb33b99377011267b8769387b (diff) | |
parent | 93869f77a076eda03a9719e9b854dfc9d0597264 (diff) | |
download | slixmpp-sleek-1.2.5.tar.gz slixmpp-sleek-1.2.5.tar.bz2 slixmpp-sleek-1.2.5.tar.xz slixmpp-sleek-1.2.5.zip |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into developsleek-1.2.51.2.5
Diffstat (limited to 'sleekxmpp/test/livesocket.py')
0 files changed, 0 insertions, 0 deletions