diff options
author | cwm <chriswmartin@protonmail.com> | 2017-12-10 15:22:15 -0600 |
---|---|---|
committer | cwm <chriswmartin@protonmail.com> | 2017-12-10 15:22:15 -0600 |
commit | 072ab191cc47692bad1145a26aa27912aeefb12f (patch) | |
tree | d217dc63f36554c7271b1c68a90d8d044640a732 /app/javascript/flavours/glitch/reducers/index.js | |
parent | eec5d350fdb94fa44c6938ca059166ff3e3e67b3 (diff) | |
parent | 26c9b9fa276fd629789fd06f65a5d698b182f67a (diff) |
pulled master, moved locale entry to new location
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/index.js')
-rw-r--r-- | app/javascript/flavours/glitch/reducers/index.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/reducers/index.js b/app/javascript/flavours/glitch/reducers/index.js index aa748421a..e9c8d7c1d 100644 --- a/app/javascript/flavours/glitch/reducers/index.js +++ b/app/javascript/flavours/glitch/reducers/index.js @@ -23,6 +23,8 @@ import media_attachments from './media_attachments'; import notifications from './notifications'; import height_cache from './height_cache'; import custom_emojis from './custom_emojis'; +import lists from './lists'; +import listEditor from './list_editor'; const reducers = { timelines, @@ -49,6 +51,8 @@ const reducers = { notifications, height_cache, custom_emojis, + lists, + listEditor, }; export default combineReducers(reducers); |