Michael Telatynski 6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 ... Conflicts: package.json src/components/views/spaces/SpacePanel.tsx src/i18n/strings/en_EN.json src/stores/SpaceStore.tsx yarn.lock		2021-06-22 21:15:53 +01:00
..
auth	…
_AutoHideScrollbar.scss	…
_CompatibilityPage.scss	…
_ContextualMenu.scss	Add CSS containement rules for shorter reflow operations	2021-06-01 11:26:32 +01:00
_CreateRoom.scss	…
_CustomRoomTagPanel.scss	…
_FilePanel.scss	…
_GenericErrorPage.scss	…
_GroupFilterPanel.scss	…
_GroupView.scss	…
_HeaderButtons.scss	…
_HomePage.scss	…
_LeftPanel.scss	Add CSS containement rules for shorter reflow operations	2021-06-01 11:26:32 +01:00
_LeftPanelWidget.scss	…
_MainSplit.scss	…
_MatrixChat.scss	…
_MyGroups.scss	…
_NonUrgentToastContainer.scss	…
_NotificationPanel.scss	Fix notif panel timestamp padding	2021-06-07 16:21:53 +01:00
_RightPanel.scss	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606	2021-06-03 08:42:05 +01:00
_RoomDirectory.scss	…
_RoomSearch.scss	…
_RoomStatusBar.scss	…
_RoomView.scss	Merge pull request #6138 from matrix-org/gsouquet/containment-event	2021-06-03 16:38:55 +01:00
_ScrollPanel.scss	Add CSS containement rules for shorter reflow operations	2021-06-01 11:26:32 +01:00
_SearchBox.scss	…
_SpacePanel.scss	First cut of space panel drag-and-drop ordering	2021-06-03 08:32:36 +01:00
_SpaceRoomDirectory.scss	…
_SpaceRoomView.scss	Fix word wrap in space descriptions	2021-06-14 22:18:02 +01:00
_TabbedView.scss	…
_ToastContainer.scss	Deprecate FormButton to use AccessibleButton everywhere	2021-06-21 14:16:37 +01:00
_UploadBar.scss	…
_UserMenu.scss	…
_ViewSource.scss	…