about summary refs log tree commit diff
path: root/app/javascript/glitch
diff options
context:
space:
mode:
authorkibigo! <marrus-sh@users.noreply.github.com>2017-10-11 11:00:28 -0700
committerkibigo! <marrus-sh@users.noreply.github.com>2017-10-11 11:00:28 -0700
commit35e2cad4eb32649ddc674f209b41e4440de5113b (patch)
tree9a25c78514cb147e51656ddac5595dce3a693664 /app/javascript/glitch
parent8d6b9ba4946b5b159af0fbd130637a226a286796 (diff)
Fixed header emojification
Diffstat (limited to 'app/javascript/glitch')
-rw-r--r--app/javascript/glitch/components/account/header.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/glitch/components/account/header.js b/app/javascript/glitch/components/account/header.js
index bc2ce30f6..9404ee6a5 100644
--- a/app/javascript/glitch/components/account/header.js
+++ b/app/javascript/glitch/components/account/header.js
@@ -48,7 +48,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 //  Mastodon imports  //
-import emojify from '../../../mastodon/emoji';
+import emojify from 'mastodon/features/emoji/emoji';
 import IconButton from '../../../mastodon/components/icon_button';
 import Avatar from '../../../mastodon/components/avatar';