diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-04 19:07:04 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-04 19:07:04 -0700 |
| commit | 6eac0606cf5cd0b7777eb86b77ed1b061dd4b658 (patch) | |
| tree | 510531e59e6ca621dee2c46d10b95d7d81eb7e84 /sleekxmpp/plugins/xep_0060/__init__.py | |
| parent | a8f57d012f28de32fddf7f22de7f3adb4190bc6e (diff) | |
| parent | b9764cc120c48576be1fe6cadb11813d12f91f4c (diff) | |
| download | slixmpp-6eac0606cf5cd0b7777eb86b77ed1b061dd4b658.tar.gz slixmpp-6eac0606cf5cd0b7777eb86b77ed1b061dd4b658.tar.bz2 slixmpp-6eac0606cf5cd0b7777eb86b77ed1b061dd4b658.tar.xz slixmpp-6eac0606cf5cd0b7777eb86b77ed1b061dd4b658.zip | |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0060/__init__.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0060/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/xep_0060/__init__.py b/sleekxmpp/plugins/xep_0060/__init__.py index a0c91f85..026f7c2b 100644 --- a/sleekxmpp/plugins/xep_0060/__init__.py +++ b/sleekxmpp/plugins/xep_0060/__init__.py @@ -1,2 +1,2 @@ -from pubsub import xep_0060 -import stanza +from sleekxmpp.plugins.xep_0060.pubsub import xep_0060 +from sleekxmpp.plugins.xep_0060 import stanza |