diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-01-11 13:42:06 -0600 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-01-11 13:42:06 -0600 |
| commit | cf0d275ae44ae0e554c039b34a9b68ddac7a081f (patch) | |
| tree | 431dd051e26f16803b888c212202299797d4661c | |
| parent | 5c49f320885c93965bb043897129cddc60cde960 (diff) | |
| parent | 49530d2f9fe2dadb66dff63f86ddf3d5a0763d52 (diff) | |
| download | chat-cf0d275ae44ae0e554c039b34a9b68ddac7a081f.tar.gz chat-cf0d275ae44ae0e554c039b34a9b68ddac7a081f.tar.bz2 chat-cf0d275ae44ae0e554c039b34a9b68ddac7a081f.zip | |
Merge branch 'release-1.4'
| -rw-r--r-- | web/react/components/admin_console/email_settings.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx index 91d73dccd..193fd4147 100644 --- a/web/react/components/admin_console/email_settings.jsx +++ b/web/react/components/admin_console/email_settings.jsx @@ -581,12 +581,12 @@ export default class EmailSettings extends React.Component { className='form-control' id='PushNotificationServer' ref='PushNotificationServer' - placeholder='E.g.: "https://push.mattermost.com"' + placeholder='E.g.: "https://push-test.mattermost.com"' defaultValue={this.props.config.EmailSettings.PushNotificationServer} onChange={this.handleChange} disabled={!this.state.sendPushNotifications} /> - <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> + <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-test.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> |