summaryrefslogtreecommitdiff
path: root/src/core/commands.py
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2014-10-14 15:51:30 +0200
committermathieui <mathieui@mathieui.net>2014-10-14 15:51:30 +0200
commit545ad1bd71e87a482b357f5b49a0898be73478d8 (patch)
treee513febd81f0c3d338b047f0672e5353e92534d4 /src/core/commands.py
parent37fe4be7ec35278f23c9f5c07607c3a14e6b6753 (diff)
parent088c6c6a0b46309d17c4b0ba5939a2dd200c7002 (diff)
downloadpoezio-545ad1bd71e87a482b357f5b49a0898be73478d8.tar.gz
poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.tar.bz2
poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.tar.xz
poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.zip
Merge branch 'master' of git.poez.io:poezio into slix
Conflicts: src/core/handlers.py src/tabs/xmltab.py
Diffstat (limited to 'src/core/commands.py')
-rw-r--r--src/core/commands.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/commands.py b/src/core/commands.py
index 07b0cb1e..c27263e2 100644
--- a/src/core/commands.py
+++ b/src/core/commands.py
@@ -943,7 +943,7 @@ def command_xml_tab(self, arg=''):
def command_adhoc(self, arg):
arg = arg.split()
if len(arg) > 1:
- return self.command_help('list')
+ return self.command_help('ad-hoc')
elif arg:
jid = safeJID(arg[0])
else: