matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-06-27 15:01:53 +03:00
Code Activity

Merge branch 'develop' into new-guest-access

Browse Source
This commit is contained in:
Luke Barnard
2017-06-07 12:08:37 +01:00
committed by GitHub
parent ccaa55d2c8 d59b0e1595
commit 53ea41e8a5
42 changed files with 561 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/login/Registration.js
View File

@ -21,11 +21,9 @@ import q from 'q';
import React from 'react';
import sdk from '../../../index';
import dis from '../../../dispatcher';
import ServerConfig from '../../views/login/ServerConfig';
import MatrixClientPeg from '../../../MatrixClientPeg';
import RegistrationForm from '../../views/login/RegistrationForm';
import CaptchaForm from '../../views/login/CaptchaForm';
import RtsClient from '../../../RtsClient';
import { _t } from '../../../languageHandler';