diff options
| author | Reverite <github@reverite.sh> | 2019-03-21 15:35:55 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-03-21 15:35:55 -0700 |
| commit | 592735fd80acd0aeffb5a5674255ed48d7a8db0b (patch) | |
| tree | 0eefc67f624a07df0af860edecd68d5dc64c7ee9 /app/javascript/flavours/glitch/util | |
| parent | 75eeb003b09c53d3b4e98046d1c20b0ad8a887bb (diff) | |
| parent | bde9196b70299405ebe9b16500b7a3f65539b2c3 (diff) | |
Merge remote-tracking branch 'glitch/master' into production
Diffstat (limited to 'app/javascript/flavours/glitch/util')
| -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 044d38cb2..73fcaa8c8 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/picker'; -import Emoji from 'emoji-mart/dist-es/components/emoji/emoji'; +import Picker from 'emoji-mart/dist-modern/components/picker/picker'; +import Emoji from 'emoji-mart/dist-modern/components/emoji/emoji'; export { Picker, |