Merge branch 'master' into readline

2015-02-16 22:53:15 +00:00
parent 1a59c6e745 0997bafeb9
commit 475ec97f99
1 changed files with 1 additions and 1 deletions
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -428,7 +428,7 @@ static struct cmd_t command_defs[] =
          "help [tag]       - Display help for form, or a specific field.",
          NULL } } },

-    { "/rooms", // TODO help review
+    { "/rooms",
        cmd_rooms, parse_args, 0, 1, NULL,
        { "/rooms [conference-service]", "List chat rooms.",
        { "/rooms [conference-service]",