Merge branch 'develop' into experimental

This commit is contained in:
Bruno Windels
2018-10-26 15:33:39 +02:00
42 changed files with 469 additions and 233 deletions
-1
View File
@@ -39,7 +39,6 @@
@import "./views/dialogs/_DevtoolsDialog.scss";
@import "./views/dialogs/_EncryptedEventDialog.scss";
@import "./views/dialogs/_GroupAddressPicker.scss";
@import "./views/dialogs/_QuestionDialog.scss";
@import "./views/dialogs/_RoomUpgradeDialog.scss";
@import "./views/dialogs/_SetEmailDialog.scss";
@import "./views/dialogs/_SetMxIdDialog.scss";