about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/util/emoji/emoji_picker.js
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-06-12 17:43:50 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-06-12 17:43:50 -0500
commitfac6e392e9d76e3cca44ce142690a59afc0a9156 (patch)
tree490c6054260f4a75fb0467f343124746c1935970 /app/javascript/flavours/glitch/util/emoji/emoji_picker.js
parent4d8d1fa129b5f8692311de211203bc18c614951f (diff)
Port emojimart 2.6.1 changes to glitch flavour
See also the following commits:

- 0c3ce41031d292734e0e4cc70d227228d1993bea
- 268d90e8103770e8b90f6d5680a466c1ec83c6ff
Diffstat (limited to 'app/javascript/flavours/glitch/util/emoji/emoji_picker.js')
-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 7e145381e..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-es/components/picker';
-import Emoji from 'emoji-mart/dist-es/components/emoji';
+import Picker from 'emoji-mart/dist-es/components/picker/picker';
+import Emoji from 'emoji-mart/dist-es/components/emoji/emoji';
 
 export {
   Picker,