summaryrefslogtreecommitdiffstats
path: root/web/react/components/admin_console/image_settings.jsx
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-09-26 13:48:03 -0700
committerCorey Hulen <corey@hulen.com>2015-09-26 13:48:03 -0700
commit16a0b63aca894f7c2b4c443612b55386c9a2227a (patch)
tree09a439eddfaf5d2abc26072ed122440288594bb0 /web/react/components/admin_console/image_settings.jsx
parent5d9d8a6c0085157ee41bca194719e396dffe5d58 (diff)
parent8af7386898737770b2b845c76c2810c7ea6697ae (diff)
downloadchat-16a0b63aca894f7c2b4c443612b55386c9a2227a.tar.gz
chat-16a0b63aca894f7c2b4c443612b55386c9a2227a.tar.bz2
chat-16a0b63aca894f7c2b4c443612b55386c9a2227a.zip
Merge pull request #819 from mattermost/it33-patch-1
Adjustments to help text of System Console
Diffstat (limited to 'web/react/components/admin_console/image_settings.jsx')
-rw-r--r--web/react/components/admin_console/image_settings.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/admin_console/image_settings.jsx b/web/react/components/admin_console/image_settings.jsx
index 25d5ad857..e52f516e8 100644
--- a/web/react/components/admin_console/image_settings.jsx
+++ b/web/react/components/admin_console/image_settings.jsx
@@ -457,7 +457,7 @@ export default class FileSettings extends React.Component {
defaultValue={this.props.config.FileSettings.PublicLinkSalt}
onChange={this.handleChange}
/>
- <p className='help-text'>{'32-character salt added to signing of public image links.'}</p>
+ <p className='help-text'>{'32-character salt added to signing of public image links. Randomly generated on install. Click "Re-Generate" to create new salt.'}</p>
<div className='help-text'>
<button
className='help-link'