Merge commit 'c8181eb0a4
' into kb_migration
This commit is contained in:
commit
ba3f60ba63
153 changed files with 426 additions and 366 deletions
|
@ -13,7 +13,7 @@ import { defineMessages } from 'react-intl';
|
|||
import { List as ImmutableList } from 'immutable';
|
||||
import { unescapeHTML } from '../utils/html';
|
||||
import { usePendingItems as preferPendingItems } from 'mastodon/initial_state';
|
||||
import compareId from 'mastodon/compare_id';
|
||||
import { compareId } from 'mastodon/compare_id';
|
||||
import { requestNotificationPermission } from '../utils/notifications';
|
||||
import { STATUS_EMOJI_REACTION_UPDATE } from './statuses';
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue