From ed7c138d91ee0f521e96fe1a4faf60dd8fd5cfde Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 5 Jun 2017 21:38:25 +0100
Subject: [PATCH] quick and dirty override to disable MD globally

---
 src/components/structures/UserSettings.js | 4 ++++
 src/i18n/strings/en_EN.json               | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 89debcb461..6cb262e79a 100644
--- 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',
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2bef4b8901..6a7c510544 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -241,6 +241,7 @@
   "Direct chats": "Direct chats",
   "disabled": "disabled",
   "Disable inline URL previews by default": "Disable inline URL previews by default",
+  "Disable markdown formatting": "Disable markdown formatting",
   "Disinvite": "Disinvite",
   "Display name": "Display name",
   "Displays action": "Displays action",