Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-10-31 10:29:24 +00:00
commit 1ffa7ae906
1 changed files with 1 additions and 1 deletions

View File

@ -22,7 +22,7 @@ import classNames from 'classnames';
import { _t } from 'matrix-react-sdk/lib/languageHandler';
import sdk from 'matrix-react-sdk';
import dis from 'matrix-react-sdk/lib/dispatcher';
import MatrixClient from 'matrix-js-sdk';
import { MatrixClient } from 'matrix-js-sdk';
import Analytics from 'matrix-react-sdk/lib/Analytics';
import rate_limited_func from 'matrix-react-sdk/lib/ratelimitedfunc';
import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';