about summary refs log tree commit diff
path: root/app/javascript/mastodon/reducers/index.js
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-09-23 05:40:28 +0200
committerGitHub <noreply@github.com>2017-09-23 05:40:28 +0200
commit66126f302167d21e4bf247e660f595ff0beaaf20 (patch)
treec63eb3ba86ec37d2a0a7fd0f39e62a1c86f785d3 /app/javascript/mastodon/reducers/index.js
parent293972f716476933df2b665ad755cafe4d29d82d (diff)
Add custom emojis to the emoji picker (#5052)
Diffstat (limited to 'app/javascript/mastodon/reducers/index.js')
-rw-r--r--app/javascript/mastodon/reducers/index.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index 0a8c3ce6c..e65144871 100644
--- a/app/javascript/mastodon/reducers/index.js
+++ b/app/javascript/mastodon/reducers/index.js
@@ -20,6 +20,7 @@ import search from './search';
 import media_attachments from './media_attachments';
 import notifications from './notifications';
 import height_cache from './height_cache';
+import custom_emojis from './custom_emojis';
 
 const reducers = {
   timelines,
@@ -43,6 +44,7 @@ const reducers = {
   media_attachments,
   notifications,
   height_cache,
+  custom_emojis,
 };
 
 export default combineReducers(reducers);