post-merge fix

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2017-07-01 13:08:23 +01:00
parent 09f017fdd2
commit fb61a5d68b
No known key found for this signature in database
GPG key ID: 0435A1D4BBD34D64
2 changed files with 5 additions and 2 deletions

View file

@ -87,12 +87,12 @@ const COMMANDS = [
{
command: '/tint',
args: '<color1> [<color2>]',
description: 'Change colourscheme of current room',
description: 'Changes colourscheme of current room',
},
{
command: '/verify',
args: '<userId> <deviceId> <deviceSigningKey>',
description: 'Verify a user, device, and pubkey tuple',
description: 'Verifies a user, device, and pubkey tuple',
},
// Omitting `/markdown` as it only seems to apply to OldComposer
];