Merge branch 'develop' into matthew/dharma

This commit is contained in:
Matthew Hodgson
2018-07-29 17:03:23 +01:00
211 changed files with 10766 additions and 4710 deletions
+1
View File
@@ -42,6 +42,7 @@
@import "./views/dialogs/_SetEmailDialog.scss";
@import "./views/dialogs/_SetMxIdDialog.scss";
@import "./views/dialogs/_SetPasswordDialog.scss";
@import "./views/dialogs/_ShareDialog.scss";
@import "./views/dialogs/_UnknownDeviceDialog.scss";
@import "./views/directory/_NetworkDropdown.scss";
@import "./views/elements/_AccessibleButton.scss";