Merge branch 'experimental' into travis/rsettings/tab/security

This commit is contained in:
Travis Ralston 2019-01-29 22:15:55 -07:00
commit f86e224db6
6 changed files with 498 additions and 54 deletions

View file

@ -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";