Merge branch 'develop' into bwindels/verification-right-panel
This commit is contained in:
commit
d1fcef1211
515 changed files with 9064 additions and 7392 deletions
|
@ -15,9 +15,9 @@ See the License for the specific language governing permissions and
|
|||
limitations under the License.
|
||||
*/
|
||||
|
||||
import MatrixClientPeg from './MatrixClientPeg';
|
||||
import {MatrixClientPeg} from './MatrixClientPeg';
|
||||
import Modal from './Modal';
|
||||
import sdk from './index';
|
||||
import * as sdk from './index';
|
||||
import { _t } from './languageHandler';
|
||||
import dis from "./dispatcher";
|
||||
import * as Rooms from "./Rooms";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue