Merge branch 'develop' into travis/custom-status
This commit is contained in:
commit
a1347add95
34 changed files with 556 additions and 233 deletions
|
@ -49,6 +49,7 @@
|
|||
@import "./views/dialogs/_ShareDialog.scss";
|
||||
@import "./views/dialogs/_UnknownDeviceDialog.scss";
|
||||
@import "./views/dialogs/keybackup/_CreateKeyBackupDialog.scss";
|
||||
@import "./views/dialogs/keybackup/_NewRecoveryMethodDialog.scss";
|
||||
@import "./views/dialogs/keybackup/_RestoreKeyBackupDialog.scss";
|
||||
@import "./views/directory/_NetworkDropdown.scss";
|
||||
@import "./views/elements/_AccessibleButton.scss";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue