diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-09-01 08:27:55 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-09-01 08:27:55 -0400 |
commit | a06a07df89d83a94e875519a4e18973a6785f924 (patch) | |
tree | 515ccd25ae71c4b6e177baef0bcf22f25a2c46c5 /web | |
parent | 82a54f9363e3a6b7d4268ef951ac427e94deacb2 (diff) | |
parent | 99865933ef333387995de4f8d0ddebcc8309c7d3 (diff) | |
download | chat-a06a07df89d83a94e875519a4e18973a6785f924.tar.gz chat-a06a07df89d83a94e875519a4e18973a6785f924.tar.bz2 chat-a06a07df89d83a94e875519a4e18973a6785f924.zip |
Merge pull request #527 from mattermost/mm-2082
HOTFIX for 0.7.0 MM-2082 Fix missing forgot password link.
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/login.jsx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 0f3aa42db..28dd64c39 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -152,7 +152,6 @@ export default class Login extends React.Component { ); } - var forgotPassword; if (loginMessage.length > 0 && emailSignup) { loginMessage = ( <div> @@ -162,7 +161,10 @@ export default class Login extends React.Component { </div> </div> ); + } + var forgotPassword; + if (emailSignup) { forgotPassword = ( <div className='form-group'> <a href={'/' + teamName + '/reset_password'}>I forgot my password</a> |