Merge branch 'experimental' of github.com:matrix-org/matrix-react-sdk into erikj/state_counters

2019-01-10 16:56:47 +00:00
parent fa6b33d629 1c42f4f5a0
commit cbf9ff6aee
58 changed files with 1168 additions and 320 deletions
@@ -5,6 +5,7 @@
@import "./structures/_ContextualMenu.scss";
@import "./structures/_CreateRoom.scss";
@import "./structures/_FilePanel.scss";
+@import "./structures/_GroupGridView.scss";
@import "./structures/_GroupView.scss";
@import "./structures/_HomePage.scss";
@import "./structures/_LeftPanel.scss";