From 80679faaa796258cef52047136ec8ca9b75b0146 Mon Sep 17 00:00:00 2001
From: it33 <it33@users.noreply.github.com>
Date: Thu, 4 Feb 2016 10:25:46 -0800
Subject: Update email_settings.jsx

---
 web/react/components/admin_console/email_settings.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx
index 435eff036..c51427aba 100644
--- a/web/react/components/admin_console/email_settings.jsx
+++ b/web/react/components/admin_console/email_settings.jsx
@@ -54,7 +54,7 @@ var holders = defineMessages({
     },
     pushServerEx: {
         id: 'admin.email.pushServerEx',
-        defaultMessage: 'E.g.: "https://push-test.mattermost.com"'
+        defaultMessage: 'E.g.: "http://push-test.mattermost.com"'
     },
     testing: {
         id: 'admin.email.testing',
@@ -954,4 +954,4 @@ EmailSettings.propTypes = {
     config: React.PropTypes.object
 };
 
-export default injectIntl(EmailSettings);
\ No newline at end of file
+export default injectIntl(EmailSettings);
-- 
cgit v1.2.3-1-g7c22


From fc9494b5876c7290e2ea3d11a79004a27fbb9c1d Mon Sep 17 00:00:00 2001
From: it33 <it33@users.noreply.github.com>
Date: Thu, 4 Feb 2016 15:37:17 -0800
Subject: Update email_settings.jsx

---
 web/react/components/admin_console/email_settings.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx
index c51427aba..1d8f9c1dc 100644
--- a/web/react/components/admin_console/email_settings.jsx
+++ b/web/react/components/admin_console/email_settings.jsx
@@ -918,7 +918,7 @@ class EmailSettings extends React.Component {
                             <p className='help-text'>
                                 <FormattedMessage
                                     id='admin.email.pushServerDesc'
-                                    defaultMessage='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.'
+                                    defaultMessage='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 http://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>
-- 
cgit v1.2.3-1-g7c22