Merge 94eb21e into 579ad30

mattermost · Mar 7, 2017 · 49f971b · 49f971b
2 parents 579ad30 + 94eb21e
commit 49f971b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/webapp/components/create_team/components/display_name.jsx b/webapp/components/create_team/components/display_name.jsx
@@ -10,7 +10,6 @@ import logoImage from 'images/logo.png';
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import {Link} from 'react-router/es6';
 import {FormattedMessage} from 'react-intl';
 
 export default class TeamSignupDisplayNamePage extends React.Component {
@@ -118,14 +117,6 @@ export default class TeamSignupDisplayNamePage extends React.Component {
                             defaultMessage='Next'
                         /><i className='fa fa-chevron-right'/>
                     </button>
-                    <div className='margin--extra'>
-                        <Link to='/select_team'>
-                            <FormattedMessage
-                                id='create_team.display_name.back'
-                                defaultMessage='Back to previous step'
-                            />
-                        </Link>
-                    </div>
                 </form>
             </div>
         );

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
@@ -1214,7 +1214,6 @@
   "create_post.tutorialTip": "<h4>Sending Messages</h4><p>Type here to write a message and press <strong>ENTER</strong> to post it.</p><p>Click the <strong>Attachment</strong> button to upload an image or a file.</p>",
   "create_post.write": "Write a message...",
   "create_team.agreement": "By proceeding to create your account and use {siteName}, you agree to our <a href={TermsOfServiceLink}>Terms of Service</a> and <a href={PrivacyPolicyLink}>Privacy Policy</a>. If you do not agree, you cannot use {siteName}.",
-  "create_team.display_name.back": "Back to previous step",
   "create_team.display_name.charLength": "Name must be {min} or more characters up to a maximum of {max}. You can add a longer team description later.",
   "create_team.display_name.nameHelp": "Name your team in any language. Your team name shows in menus and headings.",
   "create_team.display_name.next": "Next",