Merge branches 'develop' and 't3chguy/cmds' of github.com:matrix-org/matrix-react-sdk into t3chguy/cmds

 Conflicts:

	src/SlashCommands.tsx

src/SlashCommands.tsx

@@ -85,7 +85,7 @@ class Command {
         aliases = [],
         args = '',
         description,
-        runFn=undefined,
+        runFn = undefined,
         category = CommandCategories.other,
         hideCompletionAfterSpace = false,
     }: {
@@ -160,6 +160,15 @@ export const Commands = [
         },
         category: CommandCategories.messages,
     }),
+    new Command({
+        command: 'html',
+        args: '<message>',
+        description: _td('Sends a message as html, without interpreting it as markdown'),
+        runFn: function(roomId, messages) {
+            return success(MatrixClientPeg.get().sendHtmlMessage(roomId, messages, messages));
+        },
+        category: CommandCategories.messages,
+    }),
     new Command({
         command: 'ddg',
         args: '<query>',