Merge pull request #1205 from matrix-org/luke/feature-new-emojis

Bump the dep on emojione to 2.2.7 to add 🦈 and others
2017-07-11 14:13:13 +01:00 · 2017-07-11 14:13:13 +01:00 · e242e5e714
commit e242e5e714
parent cf158530f5 d146246805
3 changed files with 3 additions and 3 deletions
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@ -35,8 +35,8 @@ const CATEGORY_ORDER = [
    'nature',
    'travel',
    'flags',
+    'regional',
    'symbols',
-    'unicode9',
    'modifier',
 ];

--- a/src/stripped-emoji.json
+++ b/src/stripped-emoji.json