summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/__init__.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-07-22 14:02:26 -0700
committerLance Stout <lancestout@gmail.com>2012-07-22 14:02:26 -0700
commit2e580304f9d92d6d935a81cf81961323cf7fbf52 (patch)
tree3e1b4faf9c0c4d183dd83e4b7d0a9591a548e734 /sleekxmpp/plugins/__init__.py
parent5492e9028df8d1d2a064693b4dd06bd92cc9f60a (diff)
parentfb221a8dc046b34cf28b853ba58d57711b624027 (diff)
downloadslixmpp-2e580304f9d92d6d935a81cf81961323cf7fbf52.tar.gz
slixmpp-2e580304f9d92d6d935a81cf81961323cf7fbf52.tar.bz2
slixmpp-2e580304f9d92d6d935a81cf81961323cf7fbf52.tar.xz
slixmpp-2e580304f9d92d6d935a81cf81961323cf7fbf52.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/__init__.py')
-rw-r--r--sleekxmpp/plugins/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py
index 04db0d6e..dbab2d1c 100644
--- a/sleekxmpp/plugins/__init__.py
+++ b/sleekxmpp/plugins/__init__.py
@@ -42,6 +42,7 @@ __all__ = [
'xep_0115', # Entity Capabilities
'xep_0118', # User Tune
'xep_0128', # Extended Service Discovery
+ 'xep_0133', # Service Administration
'xep_0153', # vCard-Based Avatars
'xep_0163', # Personal Eventing Protocol
'xep_0172', # User Nickname