summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0060
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-12-27 18:05:42 -0500
committerLance Stout <lancestout@gmail.com>2011-12-27 18:05:42 -0500
commit2f2ebb37e4d1bc8b25503063d327a7d02706b3ac (patch)
tree1b31cf621a7927c9aab3ac899e19583411818abd /sleekxmpp/plugins/xep_0060
parentf6e30edbc4a717b34bbf01d3d0a9fe884c6b37da (diff)
parent522f0dac167717603f2b52c0e0c10389d9e41768 (diff)
downloadslixmpp-2f2ebb37e4d1bc8b25503063d327a7d02706b3ac.tar.gz
slixmpp-2f2ebb37e4d1bc8b25503063d327a7d02706b3ac.tar.bz2
slixmpp-2f2ebb37e4d1bc8b25503063d327a7d02706b3ac.tar.xz
slixmpp-2f2ebb37e4d1bc8b25503063d327a7d02706b3ac.zip
Merge branch 'develop' into develop-1.1
Diffstat (limited to 'sleekxmpp/plugins/xep_0060')
-rw-r--r--sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py
index 46374a35..aeaeefe0 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py
+++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py
@@ -22,7 +22,7 @@ class PubsubErrorCondition(ElementBase):
'max-items-exceeded', 'max-nodes-exceeded',
'nodeid-required', 'not-in-roster-group',
'not-subscribed', 'payload-too-big',
- 'payload-required' 'pending-subscription',
+ 'payload-required', 'pending-subscription',
'presence-subscription-required', 'subid-required',
'too-many-subscriptions', 'unsupported'))
condition_ns = 'http://jabber.org/protocol/pubsub#errors'