summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings/user_settings_advanced.jsx
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-03-17 09:51:45 -0700
committer=Corey Hulen <corey@hulen.com>2016-03-17 09:51:45 -0700
commit5273559ca101d8ae4a55104f18081ab011e5068c (patch)
treef152b638101b224ffc59ed000e384b651915266a /webapp/components/user_settings/user_settings_advanced.jsx
parent074f15f761ff50388b58e35e8354c139c06a807e (diff)
parent128204b47a9ff89bf2bea97cd21d3b8892151e69 (diff)
downloadchat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.gz
chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.bz2
chat-5273559ca101d8ae4a55104f18081ab011e5068c.zip
Fixing merge
Diffstat (limited to 'webapp/components/user_settings/user_settings_advanced.jsx')
-rw-r--r--webapp/components/user_settings/user_settings_advanced.jsx4
1 files changed, 4 insertions, 0 deletions
diff --git a/webapp/components/user_settings/user_settings_advanced.jsx b/webapp/components/user_settings/user_settings_advanced.jsx
index 7c496f57b..40897e8c9 100644
--- a/webapp/components/user_settings/user_settings_advanced.jsx
+++ b/webapp/components/user_settings/user_settings_advanced.jsx
@@ -51,6 +51,10 @@ const holders = defineMessages({
EMBED_TOGGLE: {
id: 'user.settings.advance.embed_toggle',
defaultMessage: 'Show toggle for all embed previews'
+ },
+ SLASHCMD_AUTOCMP: {
+ id: 'user.settings.advance.slashCmd_autocmp',
+ defaultMessage: 'Enable external application to offer slash command autocomplete'
}
});