diff options
| author | mathieui <mathieui@mathieui.net> | 2015-08-23 17:14:53 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2015-08-23 17:14:53 +0200 |
| commit | 804b23d390fe5733f4f2cbd1b588fbc9b7c42e21 (patch) | |
| tree | de208053ef66ad1650f650e888b836d49915603e /slixmpp/plugins/xep_0065/__init__.py | |
| parent | 6e61adf3dba6945423bb4b8812c8ed0107274f50 (diff) | |
| parent | 04eaf52b1d919e06f2a3c60ab63d625bc5d0797f (diff) | |
| download | slixmpp-804b23d390fe5733f4f2cbd1b588fbc9b7c42e21.tar.gz slixmpp-804b23d390fe5733f4f2cbd1b588fbc9b7c42e21.tar.bz2 slixmpp-804b23d390fe5733f4f2cbd1b588fbc9b7c42e21.tar.xz slixmpp-804b23d390fe5733f4f2cbd1b588fbc9b7c42e21.zip | |
Merge branch 'socks5' of http://git.linkmauve.fr/slixmpp
Diffstat (limited to 'slixmpp/plugins/xep_0065/__init__.py')
| -rw-r--r-- | slixmpp/plugins/xep_0065/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/slixmpp/plugins/xep_0065/__init__.py b/slixmpp/plugins/xep_0065/__init__.py index 2bfe007c..c392bd23 100644 --- a/slixmpp/plugins/xep_0065/__init__.py +++ b/slixmpp/plugins/xep_0065/__init__.py @@ -1,5 +1,6 @@ from slixmpp.plugins.base import register_plugin +from slixmpp.plugins.xep_0065.socks5 import Socks5Protocol from slixmpp.plugins.xep_0065.stanza import Socks5 from slixmpp.plugins.xep_0065.proxy import XEP_0065 |