mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' into kegan/reg-refactor

Browse source
This commit is contained in:
Kegan Dougal 2015-11-17 17:43:22 +00:00
commit ed3527e243
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/login/Login.js
View file

@ -20,8 +20,8 @@ var React = require('react');
var ReactDOM = require('react-dom');
var sdk = require('matrix-react-sdk');
var Signup = require("matrix-react-sdk/lib/Signup");
var PasswordLogin = require("matrix-react-sdk/lib/components/PasswordLogin");
var CasLogin = require("matrix-react-sdk/lib/components/CasLogin");
var PasswordLogin = require("matrix-react-sdk/lib/components/login/PasswordLogin");
var CasLogin = require("matrix-react-sdk/lib/components/login/CasLogin");
var ServerConfig = require("./ServerConfig");
/**