diff options
| author | Nolan Lawson <nolan@nolanlawson.com> | 2017-10-05 18:42:34 -0700 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-06 03:42:34 +0200 |
| commit | fd7f0732fe26554c51218c4f67955e8050590d2c (patch) | |
| tree | 2d0bacca4d9097035afe4f60e570bfc0f5221bb5 /app/javascript/packs | |
| parent | eb5ac234342db46c881d8e69644d3292b5eabb54 (diff) | |
Compress and combine emoji data (#5229)
Diffstat (limited to 'app/javascript/packs')
| -rw-r--r-- | app/javascript/packs/public.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js index 6f72a8050..a47fc2830 100644 --- a/app/javascript/packs/public.js +++ b/app/javascript/packs/public.js @@ -21,7 +21,7 @@ function main() { const { length } = require('stringz'); const IntlRelativeFormat = require('intl-relativeformat').default; const { delegate } = require('rails-ujs'); - const emojify = require('../mastodon/emoji').default; + const emojify = require('../mastodon/features/emoji/emoji').default; const { getLocale } = require('../mastodon/locales'); const { localeData } = getLocale(); const VideoContainer = require('../mastodon/containers/video_container').default; |