imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Bump the dep on emojione to 2.2.7 to add 🦈 and others
This commit is contained in:
David Baker 2017-07-11 14:13:13 +01:00 • committed by GitHub
commit e242e5e714
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -55,7 +55,7 @@
"draft-js": "^0.9.1", "draft-js": "^0.9.1",
"draft-js-export-html": "^0.5.0", "draft-js-export-html": "^0.5.0",
"draft-js-export-markdown": "^0.2.0", "draft-js-export-markdown": "^0.2.0",
"emojione": "2.2.3", "emojione": "2.2.7",
"file-saver": "^1.3.3", "file-saver": "^1.3.3",
"filesize": "3.5.6", "filesize": "3.5.6",
"flux": "2.1.1", "flux": "2.1.1",

2
src/autocomplete/EmojiProvider.js
View file

@ -35,8 +35,8 @@ const CATEGORY_ORDER = [
'nature', 'nature',
'travel', 'travel',
'flags', 'flags',
'regional',
'symbols', 'symbols',
'unicode9',
'modifier', 'modifier',
]; ];

2
src/stripped-emoji.json
View file

File diff suppressed because one or more lines are too long