merged tootsuite pr #5750 into glitch flavour

This commit is contained in:
cwm
2017-12-08 19:40:49 -06:00
parent 776867ea73
commit f44c8fd130
15 changed files with 1008 additions and 2 deletions

View File

@@ -23,6 +23,7 @@ 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';
const reducers = {
timelines,
@@ -49,6 +50,7 @@ const reducers = {
notifications,
height_cache,
custom_emojis,
lists,
};
export default combineReducers(reducers);