sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab

Browse Source
This commit is contained in:
Jorik Schellekens
2020-06-01 14:32:31 +01:00
parent 9e9bcb4974 419857c29c
commit 69747b6114
55 changed files with 902 additions and 870 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/css/_components.scss
+1 -1
View File
@@ -124,7 +124,6 @@
@import "./views/elements/_TooltipButton.scss";
@import "./views/elements/_Validation.scss";
@import "./views/emojipicker/_EmojiPicker.scss";
@import "./views/globals/_MatrixToolbar.scss";
@import "./views/groups/_GroupPublicityToggle.scss";
@import "./views/groups/_GroupRoomList.scss";
@import "./views/groups/_GroupUserSettings.scss";
@@ -203,6 +202,7 @@
@import "./views/settings/_ProfileSettings.scss";
@import "./views/settings/_SetIdServer.scss";
@import "./views/settings/_SetIntegrationManager.scss";
@import "./views/settings/_UpdateCheckButton.scss";
@import "./views/settings/tabs/_SettingsTab.scss";
@import "./views/settings/tabs/room/_GeneralRoomSettingsTab.scss";
@import "./views/settings/tabs/room/_RolesRoomSettingsTab.scss";