Michael Telatynski 2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 ... Conflicts: src/components/views/spaces/SpaceCreateMenu.tsx		2021-05-11 13:40:28 +01:00
..
auth	…
_AutoHideScrollbar.scss	…
_CompatibilityPage.scss	…
_ContextualMenu.scss	…
_CreateRoom.scss	…
_CustomRoomTagPanel.scss	…
_FilePanel.scss	Remove weird margin from the file panel	2021-04-20 08:22:43 +02:00
_GenericErrorPage.scss	…
_GroupFilterPanel.scss	Add animated mx_BetaDot atop the legacy Communities button	2021-04-27 17:01:22 +01:00
_GroupView.scss	…
_HeaderButtons.scss	…
_HomePage.scss	…
_LeftPanel.scss	…
_LeftPanelWidget.scss	…
_MainSplit.scss	…
_MatrixChat.scss	…
_MyGroups.scss	Further design iteration	2021-04-29 22:02:18 +01:00
_NonUrgentToastContainer.scss	…
_NotificationPanel.scss	…
_RightPanel.scss	…
_RoomDirectory.scss	…
_RoomSearch.scss	…
_RoomStatusBar.scss	Dark theme support	2021-04-21 16:24:17 -06:00
_RoomView.scss	…
_ScrollPanel.scss	Remove overflow: hidden	2021-04-15 18:02:48 +02:00
_SearchBox.scss	…
_SpacePanel.scss	move notification dot on the space panel up by 1px	2021-05-07 10:22:56 +01:00
_SpaceRoomDirectory.scss	Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent	2021-05-06 13:05:58 +01:00
_SpaceRoomView.scss	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021	2021-05-11 13:40:28 +01:00
_TabbedView.scss	…
_ToastContainer.scss	…
_UploadBar.scss	…
_UserMenu.scss	…
_ViewSource.scss	…