Merge branch 'experimental' into travis/rsettings/tab/security
This commit is contained in:
commit
f86e224db6
6 changed files with 498 additions and 54 deletions
|
@ -143,6 +143,7 @@
|
|||
@import "./views/settings/tabs/_GeneralUserSettingsTab.scss";
|
||||
@import "./views/settings/tabs/_HelpSettingsTab.scss";
|
||||
@import "./views/settings/tabs/_PreferencesSettingsTab.scss";
|
||||
@import "./views/settings/tabs/_RolesRoomSettingsTab.scss";
|
||||
@import "./views/settings/tabs/_SecurityRoomSettingsTab.scss";
|
||||
@import "./views/settings/tabs/_SecuritySettingsTab.scss";
|
||||
@import "./views/settings/tabs/_SettingsTab.scss";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue