diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-23 01:41:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-23 01:41:00 +0200 |
| commit | 846cd4e8381c891816cf814582304b534db4ee5f (patch) | |
| tree | fb7c718bd3071bf5128f6c270901623aab54a0f0 /app/javascript/styles/application.scss | |
| parent | 0de82dd316839ed329504bfbf9bd0f2d3d96e654 (diff) | |
Switch from EmojiOne to Twemoji, different emoji picker (#5046)
* Switch from EmojiOne to Twemoji, different emoji picker * Make emoji-mart use a local spritesheet * Fix emojify test * yarn manage:translations
Diffstat (limited to 'app/javascript/styles/application.scss')
| -rw-r--r-- | app/javascript/styles/application.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index f418ba699..0eb6ac6d8 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -15,6 +15,7 @@ @import 'accounts'; @import 'stream_entries'; @import 'components'; +@import 'emoji_picker'; @import 'about'; @import 'tables'; @import 'admin'; |