summaryrefslogtreecommitdiffstats
path: root/web/react/pages/login.jsx
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-03 13:39:22 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-03 13:39:22 -0700
commit05d95d80a896d14474c7f7384d67b9edd524b922 (patch)
tree2fcc619c38175014813ffc7df34abad82e5d5b77 /web/react/pages/login.jsx
parent48ca3a4007c8b9c40a3bc3789563ed9992e9b64d (diff)
parent4f0c06114b61c92d982baac1c54ed80da93a9cc9 (diff)
downloadchat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.gz
chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.bz2
chat-05d95d80a896d14474c7f7384d67b9edd524b922.zip
Merge branch 'master' into PLT-12
Diffstat (limited to 'web/react/pages/login.jsx')
-rw-r--r--web/react/pages/login.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/pages/login.jsx b/web/react/pages/login.jsx
index e7305889d..424ae0e84 100644
--- a/web/react/pages/login.jsx
+++ b/web/react/pages/login.jsx
@@ -8,7 +8,8 @@ function setupLoginPage(teamDisplayName, teamName, authServices) {
<Login
teamDisplayName={teamDisplayName}
teamName={teamName}
- authServices={authServices} />,
+ authServices={authServices}
+ />,
document.getElementById('login')
);
}