Merge 1606c6a into bd5b6f1

mattermost · Mar 31, 2017 · f8dcf7f · f8dcf7f
2 parents bd5b6f1 + 1606c6a
commit f8dcf7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx
@@ -389,7 +389,7 @@ export default class AdminSidebar extends React.Component {
                                 }
                             >
                                 <AdminSidebarSection
-                                    name='email'
+                                    name='authentication_email'
                                     title={
                                         <FormattedMessage
                                             id='admin.sidebar.email'
@@ -469,7 +469,7 @@ export default class AdminSidebar extends React.Component {
                                 }
                             >
                                 <AdminSidebarSection
-                                    name='email'
+                                    name='notifications_email'
                                     title={
                                         <FormattedMessage
                                             id='admin.sidebar.email'

diff --git a/webapp/routes/route_admin_console.jsx b/webapp/routes/route_admin_console.jsx
@@ -85,9 +85,9 @@ export default (
             />
         </Route>
         <Route path='authentication'>
-            <IndexRedirect to='email'/>
+            <IndexRedirect to='authentication_email'/>
             <Route
-                path='email'
+                path='authentication_email'
                 component={EmailAuthenticationSettings}
             />
             <Route
@@ -135,9 +135,9 @@ export default (
             />
         </Route>
         <Route path='notifications'>
-            <IndexRedirect to='email'/>
+            <IndexRedirect to='notifications_email'/>
             <Route
-                path='email'
+                path='notifications_email'
                 component={EmailSettings}
             />
             <Route