Merge commit '71db616fed
' into kb_migration
This commit is contained in:
commit
f18fa97f0c
607 changed files with 3491 additions and 2677 deletions
|
@ -29,7 +29,6 @@ import lists from './lists';
|
|||
import markers from './markers';
|
||||
import media_attachments from './media_attachments';
|
||||
import meta from './meta';
|
||||
import { missedUpdatesReducer } from './missed_updates';
|
||||
import { modalReducer } from './modal';
|
||||
import mutes from './mutes';
|
||||
import notifications from './notifications';
|
||||
|
@ -89,7 +88,6 @@ const reducers = {
|
|||
suggestions,
|
||||
polls,
|
||||
trends,
|
||||
missed_updates: missedUpdatesReducer,
|
||||
markers,
|
||||
picture_in_picture,
|
||||
history,
|
||||
|
@ -109,7 +107,7 @@ const initialRootState = Object.fromEntries(
|
|||
reducer(undefined, {
|
||||
// empty action
|
||||
}),
|
||||
])
|
||||
]),
|
||||
);
|
||||
|
||||
const RootStateRecord = ImmutableRecord(initialRootState, 'RootState');
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue