Merge commit 'c8181eb0a4
' into kb_migration
This commit is contained in:
commit
ba3f60ba63
153 changed files with 426 additions and 366 deletions
|
@ -29,7 +29,7 @@ import {
|
|||
import { DOMAIN_BLOCK_SUCCESS } from 'mastodon/actions/domain_blocks';
|
||||
import { TIMELINE_DELETE, TIMELINE_DISCONNECT } from '../actions/timelines';
|
||||
import { fromJS, Map as ImmutableMap, List as ImmutableList } from 'immutable';
|
||||
import compareId from '../compare_id';
|
||||
import { compareId } from '../compare_id';
|
||||
|
||||
const initialState = ImmutableMap({
|
||||
pendingItems: ImmutableList(),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue