nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into dbkr/my_groups

Browse Source
This commit is contained in:
David Baker
2017-07-07 10:47:41 +01:00
parent 17bd323376 e36899c30f
commit 43bdc04637
17 changed files with 306 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/skins/vector/css/_components.scss
View File

@@ -58,6 +58,7 @@
@import "./matrix-react-sdk/views/rooms/_SearchableEntityList.scss";
@import "./matrix-react-sdk/views/rooms/_TabCompleteBar.scss";
@import "./matrix-react-sdk/views/rooms/_TopUnreadMessagesBar.scss";
@import "./matrix-react-sdk/views/rooms/_AppsDrawer.scss";
@import "./matrix-react-sdk/views/settings/_DevicesPanel.scss";
@import "./matrix-react-sdk/views/settings/_IntegrationsManager.scss";
@import "./matrix-react-sdk/views/voip/_CallView.scss";