merged tootsuite pr #5811 into glitch flavour

This commit is contained in:
cwm
2017-12-08 20:13:08 -06:00
parent f44c8fd130
commit 47157e07b2
9 changed files with 120 additions and 0 deletions

View File

@@ -24,6 +24,7 @@ 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,
@@ -51,6 +52,7 @@ const reducers = {
height_cache,
custom_emojis,
lists,
listEditor,
};
export default combineReducers(reducers);