Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Compress and combine emoji data (#5229)

Browse source
This commit is contained in:
Nolan Lawson 2017-10-05 18:42:34 -07:00 • committed by Eugen Rochko
parent eb5ac23434
commit fd7f0732fe
22 changed files with 254 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/reducers/accounts.js
View file

@ -44,7 +44,7 @@ import {
FAVOURITED_STATUSES_EXPAND_SUCCESS,
} from '../actions/favourites';
import { STORE_HYDRATE } from '../actions/store';
import emojify from '../emoji';
import emojify from '../features/emoji/emoji';
import { Map as ImmutableMap, fromJS } from 'immutable';
import escapeTextContentForBrowser from 'escape-html';