diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-16 18:06:40 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-16 18:06:40 +0500 |
| commit | 0fbe63eb37b0764a106b0fdd47bc149f122b520d (patch) | |
| tree | 77cadc54d3a8d0e7812e69c50628cc7f3c5d71b7 /web/react/utils/constants.jsx | |
| parent | b00ffa83e7371fa7dd4570130ee8b506943aee01 (diff) | |
| parent | 89716cb046ee3c8f13b361053d91149f5ce29cbf (diff) | |
| download | chat-0fbe63eb37b0764a106b0fdd47bc149f122b520d.tar.gz chat-0fbe63eb37b0764a106b0fdd47bc149f122b520d.tar.bz2 chat-0fbe63eb37b0764a106b0fdd47bc149f122b520d.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'web/react/utils/constants.jsx')
| -rw-r--r-- | web/react/utils/constants.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index b8200db54..b7b8d3c60 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -289,7 +289,8 @@ module.exports = { } ], Preferences: { - CATEGORY_DIRECT_CHANNEL_SHOW: 'direct_channel_show' + CATEGORY_DIRECT_CHANNEL_SHOW: 'direct_channel_show', + CATEGORY_DISPLAY_SETTINGS: 'display_settings' }, KeyCodes: { UP: 38, |