Merge branch 'develop' into bwindels/bacat-scrolling-merged-develop

This commit is contained in:
Bruno Windels
2019-03-27 11:46:28 +01:00
26 changed files with 641 additions and 54 deletions
+1
View File
@@ -71,6 +71,7 @@
@import "./views/dialogs/_ShareDialog.scss";
@import "./views/dialogs/_UnknownDeviceDialog.scss";
@import "./views/dialogs/_UserSettingsDialog.scss";
@import "./views/dialogs/_WidgetOpenIDPermissionsDialog.scss";
@import "./views/dialogs/keybackup/_CreateKeyBackupDialog.scss";
@import "./views/dialogs/keybackup/_KeyBackupFailedDialog.scss";
@import "./views/dialogs/keybackup/_RestoreKeyBackupDialog.scss";