summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0048/__init__.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-01-04 03:00:43 -0800
committerLance Stout <lancestout@gmail.com>2013-01-04 03:00:43 -0800
commit0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08 (patch)
tree74f47de958471c492a7d12afe1e59729a52e3909 /sleekxmpp/plugins/xep_0048/__init__.py
parentef76f923ad885d8faa67e88d76704cbe8253b153 (diff)
parent6c0afb87b919f1f0321146323e917480851b2d63 (diff)
downloadslixmpp-0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08.tar.gz
slixmpp-0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08.tar.bz2
slixmpp-0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08.tar.xz
slixmpp-0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0048/__init__.py')
-rw-r--r--sleekxmpp/plugins/xep_0048/__init__.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/sleekxmpp/plugins/xep_0048/__init__.py b/sleekxmpp/plugins/xep_0048/__init__.py
new file mode 100644
index 00000000..2c98d061
--- /dev/null
+++ b/sleekxmpp/plugins/xep_0048/__init__.py
@@ -0,0 +1,15 @@
+"""
+ SleekXMPP: The Sleek XMPP Library
+ Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of SleekXMPP.
+
+ See the file LICENSE for copying permission.
+"""
+
+from sleekxmpp.plugins.base import register_plugin
+
+from sleekxmpp.plugins.xep_0048.stanza import Bookmarks, Conference, URL
+from sleekxmpp.plugins.xep_0048.bookmarks import XEP_0048
+
+
+register_plugin(XEP_0048)