Compress and combine emoji data (#5229)

2017-10-05 18:42:34 -07:00
parent eb5ac23434
commit fd7f0732fe
22 changed files with 254 additions and 93 deletions
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@ -1,6 +1,6 @@
 import api from '../api';
 import { throttle } from 'lodash';
-import { search as emojiSearch } from '../emoji_index_light';
+import { search as emojiSearch } from '../features/emoji/emoji_mart_search_light';

 import {
  updateTimeline,