about summary refs log tree commit diff
path: root/app/javascript/mastodon/reducers/accounts.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/accounts.js
parenteb5ac234342db46c881d8e69644d3292b5eabb54 (diff)
Compress and combine emoji data (#5229)
Diffstat (limited to 'app/javascript/mastodon/reducers/accounts.js')
-rw-r--r--app/javascript/mastodon/reducers/accounts.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/reducers/accounts.js b/app/javascript/mastodon/reducers/accounts.js
index 5391a93ae..8a4d69f26 100644
--- a/app/javascript/mastodon/reducers/accounts.js
+++ b/app/javascript/mastodon/reducers/accounts.js
@@ -44,7 +44,7 @@ import {
   FAVOURITED_STATUSES_EXPAND_SUCCESS,
 } from '../actions/favourites';
 import { STORE_HYDRATE } from '../actions/store';
-import emojify from '../emoji';
+import emojify from '../features/emoji/emoji';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 import escapeTextContentForBrowser from 'escape-html';