diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-02 14:13:23 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-02 14:13:23 -0400 |
| commit | e3aa888026b2883ec6b9275ce7729866149fc5fa (patch) | |
| tree | 3d060eb0a6dafbbb4fdb016e2932fb90f3a85993 /web/react | |
| parent | 04c75cfe4243cbb7e6c652f796f071f4cb61da6a (diff) | |
| parent | 57051a6c3f6dc43bfce635056c8482793a0bbcd0 (diff) | |
| download | chat-e3aa888026b2883ec6b9275ce7729866149fc5fa.tar.gz chat-e3aa888026b2883ec6b9275ce7729866149fc5fa.tar.bz2 chat-e3aa888026b2883ec6b9275ce7729866149fc5fa.zip | |
Merge branch 'release-0.7.0'
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/team_signup_password_page.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/team_signup_password_page.jsx b/web/react/components/team_signup_password_page.jsx index 6b21915f6..18cf05dad 100644 --- a/web/react/components/team_signup_password_page.jsx +++ b/web/react/components/team_signup_password_page.jsx @@ -41,7 +41,7 @@ module.exports = React.createClass({ client.loginByEmail(teamSignup.team.name, teamSignup.team.email, teamSignup.user.password, function(data) { UserStore.setLastEmail(teamSignup.team.email); - UserStore.setCurrentUser(teamSignup.user); + UserStore.setCurrentUser(data); if (this.props.hash > 0) { BrowserStore.setGlobalItem(this.props.hash, JSON.stringify({wizard: 'finished'})); } |