From 90175a1872cace45ae0e410ed283fab25c9e42cd Mon Sep 17 00:00:00 2001
From: eal <eal@waifu.club>
Date: Thu, 1 Feb 2018 18:12:23 +0200
Subject: [PATCH] Fix name clash on unicode and custom emoji

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index 51e0f7eb..305077b1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -136,7 +136,7 @@ window.fetch('/api/pleroma/emoji.json')
           const emoji = Object.keys(values).map((key) => {
             return { shortcode: key, image_url: values[key] }
           })
-          store.dispatch('setOption', { name: 'emoji', value: emoji })
+          store.dispatch('setOption', { name: 'customEmoji', value: emoji })
         },
         (failure) => {}
       ),