Merge branch 'develop' into new-guest-access

2017-06-06 10:33:01 +01:00 · 2017-06-06 10:33:01 +01:00 · f8198ba9c9
commit f8198ba9c9
parent a99f6525c9 ed7c138d91
4 changed files with 12 additions and 3 deletions
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@ -88,6 +88,10 @@ const SETTINGS_LABELS = [
        id: 'hideRedactions',
        label: 'Hide removed messages',
    },
+    {
+        id: 'disableMarkdown',
+        label: 'Disable markdown formatting',
+    },
 /*
    {
        id: 'useFixedWidthFont',