diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-30 14:33:32 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-30 14:33:32 -0400 |
commit | 74d2c5b6ceb507e11032c79252f1778e7512d612 (patch) | |
tree | e2addd98f0a14cdf54fce337bfc9d732de6f0f04 /webapp/root.jsx | |
parent | 6cad40ecf41740ae57a14df12dc363adafb49d18 (diff) | |
parent | f9a3a4b3949dddecae413b97904c895b2cd887bf (diff) | |
download | chat-74d2c5b6ceb507e11032c79252f1778e7512d612.tar.gz chat-74d2c5b6ceb507e11032c79252f1778e7512d612.tar.bz2 chat-74d2c5b6ceb507e11032c79252f1778e7512d612.zip |
Merge pull request #2518 from mattermost/plt-2187
PLT-2187 Add MFA functionality
Diffstat (limited to 'webapp/root.jsx')
-rw-r--r-- | webapp/root.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/root.jsx b/webapp/root.jsx index fca368bdb..adabe3fa3 100644 --- a/webapp/root.jsx +++ b/webapp/root.jsx @@ -12,7 +12,6 @@ import React from 'react'; import ReactDOM from 'react-dom'; import {Router, Route, IndexRoute, IndexRedirect, browserHistory} from 'react-router'; import Root from 'components/root.jsx'; -import Login from 'components/login.jsx'; import LoggedIn from 'components/logged_in.jsx'; import NotLoggedIn from 'components/not_logged_in.jsx'; import NeedsTeam from 'components/needs_team.jsx'; @@ -58,6 +57,8 @@ import OAuthToEmail from 'components/claim/components/oauth_to_email.jsx'; import LDAPToEmail from 'components/claim/components/ldap_to_email.jsx'; import EmailToLDAP from 'components/claim/components/email_to_ldap.jsx'; +import Login from 'components/login/login.jsx'; + import * as I18n from 'i18n/i18n.jsx'; // This is for anything that needs to be done for ALL react components. |