summaryrefslogtreecommitdiffstats
path: root/web/react/components/team_signup_username_page.jsx
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-19 11:42:40 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-19 11:42:40 -0700
commit36658c13a4c7ebdfff22b8570e0db52bfa4de000 (patch)
treedc27373b42b8fe2a5f8ae88191924f27c361afb6 /web/react/components/team_signup_username_page.jsx
parent097d17bf2c4e07a153beb80afb15a546f291a418 (diff)
parentd139c9e825d0149329d90684ebe2d6b31a728b16 (diff)
downloadchat-36658c13a4c7ebdfff22b8570e0db52bfa4de000.tar.gz
chat-36658c13a4c7ebdfff22b8570e0db52bfa4de000.tar.bz2
chat-36658c13a4c7ebdfff22b8570e0db52bfa4de000.zip
Fixing merge conflicts
Diffstat (limited to 'web/react/components/team_signup_username_page.jsx')
-rw-r--r--web/react/components/team_signup_username_page.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/team_signup_username_page.jsx b/web/react/components/team_signup_username_page.jsx
index 21e76e2b8..d8d0dbf2c 100644
--- a/web/react/components/team_signup_username_page.jsx
+++ b/web/react/components/team_signup_username_page.jsx
@@ -15,7 +15,7 @@ export default class TeamSignupUsernamePage extends React.Component {
}
submitBack(e) {
e.preventDefault();
- if (global.window.config.SendEmailNotifications === 'true') {
+ if (global.window.mm_config.SendEmailNotifications === 'true') {
this.props.state.wizard = 'send_invites';
} else {
this.props.state.wizard = 'team_url';