Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty

This commit is contained in:
Half-Shot 2020-01-28 16:01:50 +00:00
commit ff532dd684
10 changed files with 162 additions and 21 deletions

View file

@ -66,6 +66,7 @@
@import "./views/dialogs/_IncomingSasDialog.scss";
@import "./views/dialogs/_InviteDialog.scss";
@import "./views/dialogs/_MessageEditHistoryDialog.scss";
@import "./views/dialogs/_NewSessionReviewDialog.scss";
@import "./views/dialogs/_RoomSettingsDialog.scss";
@import "./views/dialogs/_RoomSettingsDialogBridges.scss";
@import "./views/dialogs/_RoomUpgradeDialog.scss";