diff options
author | Lance Stout <lancestout@gmail.com> | 2011-08-12 16:47:58 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-08-12 16:47:58 -0700 |
commit | 484efff156e344fc3ca1a7377539132b702c0c78 (patch) | |
tree | fa051515b9dc15eb3a5ab1a8e8b9c2e25b920d17 /sleekxmpp/plugins/xep_0050/adhoc.py | |
parent | 89cffd43f48cfc835b70e137776eb8c2e73a0b67 (diff) | |
parent | 8f1d0e7a79b662e5f2849cea6e73716cc887e226 (diff) | |
download | slixmpp-484efff156e344fc3ca1a7377539132b702c0c78.tar.gz slixmpp-484efff156e344fc3ca1a7377539132b702c0c78.tar.bz2 slixmpp-484efff156e344fc3ca1a7377539132b702c0c78.tar.xz slixmpp-484efff156e344fc3ca1a7377539132b702c0c78.zip |
Merge branch 'develop' into roster
Conflicts:
setup.py
sleekxmpp/clientxmpp.py
Diffstat (limited to 'sleekxmpp/plugins/xep_0050/adhoc.py')
-rw-r--r-- | sleekxmpp/plugins/xep_0050/adhoc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0050/adhoc.py b/sleekxmpp/plugins/xep_0050/adhoc.py index 72c6c513..dd1c88d6 100644 --- a/sleekxmpp/plugins/xep_0050/adhoc.py +++ b/sleekxmpp/plugins/xep_0050/adhoc.py @@ -589,5 +589,5 @@ class xep_0050(base_plugin): elif iq['type'] == 'error': self.terminate_command(session) - if iq['command']['status'] == 'completed': + if iq['command']['status'] == 'completed': self.terminate_command(session) |