diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-07-18 15:45:23 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-07-18 15:45:23 -0700 |
| commit | 97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80 (patch) | |
| tree | ec2d68077dd2b12de3173871622f3ec2a2b61d35 /webapp/actions/emoji_actions.jsx | |
| parent | 21a3219b9b1df033635631afa751742bd4c56ea0 (diff) | |
| parent | a350f4dc0754e1aeabb64bd712ce05f7c59cfa60 (diff) | |
| download | chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.tar.gz chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.tar.bz2 chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.zip | |
Merge branch 'release-4.0'
Diffstat (limited to 'webapp/actions/emoji_actions.jsx')
| -rw-r--r-- | webapp/actions/emoji_actions.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/actions/emoji_actions.jsx b/webapp/actions/emoji_actions.jsx index a6323449e..1c0d8b5ea 100644 --- a/webapp/actions/emoji_actions.jsx +++ b/webapp/actions/emoji_actions.jsx @@ -13,7 +13,7 @@ import {getProfilesByIds} from 'mattermost-redux/actions/users'; import * as EmojiActions from 'mattermost-redux/actions/emojis'; export async function loadEmoji(getProfiles = true) { - const data = await EmojiActions.getAllCustomEmojis(10000)(dispatch, getState); + const data = await EmojiActions.getAllCustomEmojis()(dispatch, getState); if (data && getProfiles) { loadProfilesForEmoji(data); |