diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-06-12 18:13:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 18:13:30 -0500 |
| commit | 5cff053944b4327477ca45882c9dd3b1a7a559e8 (patch) | |
| tree | 83c564879534ea35f468ce319342e011773f24aa /app/javascript/flavours/glitch/util/emoji/emoji_picker.js | |
| parent | 99b2bc2668e79bacd7f8696315206872086ebf3a (diff) | |
| parent | f6bb50b6ece555af138df164680189b1ec57da4b (diff) | |
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
Diffstat (limited to 'app/javascript/flavours/glitch/util/emoji/emoji_picker.js')
| -rw-r--r-- | app/javascript/flavours/glitch/util/emoji/emoji_picker.js | 4 |
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, |