diff options
author | Robert Robinson <rerobins@gmail.com> | 2015-09-15 10:07:34 -0600 |
---|---|---|
committer | Robert Robinson <rerobins@gmail.com> | 2015-09-15 10:07:34 -0600 |
commit | 7059400020d21c960b87aa41189b1b26c3776061 (patch) | |
tree | a8b563451b58ba582564f5ef5c2b7f8c7e2735cd /sleekxmpp/thirdparty/socks.py | |
parent | 110cf25c6d6055e0decb6907bfc7d0df8434c839 (diff) | |
parent | 0b14ef82d4058925e7e9db22038777d4654e8199 (diff) | |
download | slixmpp-7059400020d21c960b87aa41189b1b26c3776061.tar.gz slixmpp-7059400020d21c960b87aa41189b1b26c3776061.tar.bz2 slixmpp-7059400020d21c960b87aa41189b1b26c3776061.tar.xz slixmpp-7059400020d21c960b87aa41189b1b26c3776061.zip |
Merge branch 'refactor_forms' into add_xep_0122
Diffstat (limited to 'sleekxmpp/thirdparty/socks.py')
0 files changed, 0 insertions, 0 deletions