diff options
author | Lance Stout <lancestout@gmail.com> | 2010-12-13 14:36:53 -0500 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2010-12-13 14:36:53 -0500 |
commit | c16913c99929a6a5a57611ec8a1757e3e82d4a45 (patch) | |
tree | d92b98975b3dc012c734997e6fddc0ac9e2b82d8 /sleekxmpp/plugins/xep_0030/__init__.py | |
parent | 12b61365adbbc910841475ea3cf8204f26ccd9c7 (diff) | |
parent | f4451fe6b72f7cfb9680ead7a608d5ca1bc7e753 (diff) | |
download | slixmpp-c16913c99929a6a5a57611ec8a1757e3e82d4a45.tar.gz slixmpp-c16913c99929a6a5a57611ec8a1757e3e82d4a45.tar.bz2 slixmpp-c16913c99929a6a5a57611ec8a1757e3e82d4a45.tar.xz slixmpp-c16913c99929a6a5a57611ec8a1757e3e82d4a45.zip |
Merge branch 'develop' into roster
Conflicts:
sleekxmpp/basexmpp.py
Diffstat (limited to 'sleekxmpp/plugins/xep_0030/__init__.py')
-rw-r--r-- | sleekxmpp/plugins/xep_0030/__init__.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sleekxmpp/plugins/xep_0030/__init__.py b/sleekxmpp/plugins/xep_0030/__init__.py new file mode 100644 index 00000000..2e183852 --- /dev/null +++ b/sleekxmpp/plugins/xep_0030/__init__.py @@ -0,0 +1,12 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout + This file is part of SleekXMPP. + + See the file LICENSE for copying permission. +""" + +from sleekxmpp.plugins.xep_0030 import stanza +from sleekxmpp.plugins.xep_0030.stanza import DiscoInfo, DiscoItems +from sleekxmpp.plugins.xep_0030.static import StaticDisco +from sleekxmpp.plugins.xep_0030.disco import xep_0030 |