nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki 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/views/elements/AddressTile.js
View File

@@ -19,9 +19,7 @@ limitations under the License.
import React from 'react';
import classNames from 'classnames';
import sdk from "../../../index";
import Invite from "../../../Invite";
import MatrixClientPeg from "../../../MatrixClientPeg";
import Avatar from '../../../Avatar';
import { _t } from '../../../languageHandler';
// React PropType definition for an object describing

1
src/components/views/elements/LanguageDropdown.js
View File

@@ -19,7 +19,6 @@ import React from 'react';
import sdk from '../../../index';
import UserSettingsStore from '../../../UserSettingsStore';
import { _t } from '../../../languageHandler';
import * as languageHandler from '../../../languageHandler';
function languageMatchesSearchQuery(query, language) {