From c4fd729b34910cf247f0a7ddfd473e5040b0b6bf Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Mon, 25 Sep 2017 18:30:26 +0300
Subject: Remove emoji support, because it breaks MAC addresses, urls, code
 etc. Thanks to xet7 ! Closes #1248, closes #743, closes #643, closes #323

---
 client/components/main/editor.jade | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'client/components/main/editor.jade')

diff --git a/client/components/main/editor.jade b/client/components/main/editor.jade
index f10d64a1..31f533e6 100644
--- a/client/components/main/editor.jade
+++ b/client/components/main/editor.jade
@@ -9,6 +9,5 @@ template(name="editor")
 template(name="viewer")
   .viewer
     +mentions
-      +emoji
-        +markdown
-          {{> UI.contentBlock }}
+      +markdown
+        {{> UI.contentBlock }}
-- 
cgit v1.2.3-1-g7c22