diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-12-14 19:01:22 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-12-14 19:01:22 -0500 |
| commit | 74f427fb1a5da8ccd0bbc4e4104830cfa12c70fb (patch) | |
| tree | b063683a1ec022c3ccbb2561d30734e0a9156905 /web/react/components/admin_console/email_settings.jsx | |
| parent | 6c7c04f38d0485dadcd7dd0ea2ba3a95bdfde448 (diff) | |
| parent | f51d45f6cba0e5a1249146afe4a1c78cf32b7598 (diff) | |
| download | chat-74f427fb1a5da8ccd0bbc4e4104830cfa12c70fb.tar.gz chat-74f427fb1a5da8ccd0bbc4e4104830cfa12c70fb.tar.bz2 chat-74f427fb1a5da8ccd0bbc4e4104830cfa12c70fb.zip | |
Merge branch 'release-1.3'
Diffstat (limited to 'web/react/components/admin_console/email_settings.jsx')
| -rw-r--r-- | web/react/components/admin_console/email_settings.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx index 238ace3da..42e3507d6 100644 --- a/web/react/components/admin_console/email_settings.jsx +++ b/web/react/components/admin_console/email_settings.jsx @@ -586,7 +586,7 @@ export default class EmailSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.sendPushNotifications} /> - <p className='help-text'>{'Location of the push notification server.'}</p> + <p className='help-text'>{'Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use https://push.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.'}</p> </div> </div> |