about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/util
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-27 14:37:44 +0100
committerGitHub <noreply@github.com>2019-03-27 14:37:44 +0100
commit0418bdd71f59b4d7e9f3498f2990c8b044f310e1 (patch)
tree77638b42c9f4d795275a5080bcb7fd45009aa88e /app/javascript/flavours/glitch/util
parent7535c607f40cb31fbb68c8f416992c3c5fcc929d (diff)
parent3a2f646cb125c80b82a2a67a622994d332ede811 (diff)
Merge pull request #969 from ThibG/glitch-soc/fixes/revert-emojimart
Revert emojimart update
Diffstat (limited to 'app/javascript/flavours/glitch/util')
-rw-r--r--app/javascript/flavours/glitch/util/emoji/emoji_picker.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/util/emoji/emoji_picker.js b/app/javascript/flavours/glitch/util/emoji/emoji_picker.js
index 73fcaa8c8..044d38cb2 100644
--- a/app/javascript/flavours/glitch/util/emoji/emoji_picker.js
+++ b/app/javascript/flavours/glitch/util/emoji/emoji_picker.js
@@ -1,5 +1,5 @@
-import Picker from 'emoji-mart/dist-modern/components/picker/picker';
-import Emoji from 'emoji-mart/dist-modern/components/emoji/emoji';
+import Picker from 'emoji-mart/dist-es/components/picker/picker';
+import Emoji from 'emoji-mart/dist-es/components/emoji/emoji';
 
 export {
   Picker,