about summary refs log tree commit diff
path: root/app/javascript/mastodon/reducers/custom_emojis.js
diff options
context:
space:
mode:
authorNolan Lawson <nolan@nolanlawson.com>2017-10-05 18:42:34 -0700
committerEugen Rochko <eugen@zeonfederated.com>2017-10-06 03:42:34 +0200
commitfd7f0732fe26554c51218c4f67955e8050590d2c (patch)
tree2d0bacca4d9097035afe4f60e570bfc0f5221bb5 /app/javascript/mastodon/reducers/custom_emojis.js
parenteb5ac234342db46c881d8e69644d3292b5eabb54 (diff)
Compress and combine emoji data (#5229)
Diffstat (limited to 'app/javascript/mastodon/reducers/custom_emojis.js')
-rw-r--r--app/javascript/mastodon/reducers/custom_emojis.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/reducers/custom_emojis.js b/app/javascript/mastodon/reducers/custom_emojis.js
index b7c9b1d7c..307bcc7dc 100644
--- a/app/javascript/mastodon/reducers/custom_emojis.js
+++ b/app/javascript/mastodon/reducers/custom_emojis.js
@@ -1,7 +1,7 @@
 import { List as ImmutableList } from 'immutable';
 import { STORE_HYDRATE } from '../actions/store';
-import { search as emojiSearch } from '../emoji_index_light';
-import { buildCustomEmojis } from '../emoji';
+import { search as emojiSearch } from '../features/emoji/emoji_mart_search_light';
+import { buildCustomEmojis } from '../features/emoji/emoji';
 
 const initialState = ImmutableList();