Michael Telatynski 02dbdc5c0a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 ... Conflicts: src/components/views/spaces/SpaceTreeLevel.tsx src/dispatcher/actions.ts src/i18n/strings/en_EN.json		2021-07-29 16:11:16 +01:00
..
auth	…
_AutoHideScrollbar.scss	…
_CompatibilityPage.scss	…
_ContextualMenu.scss	…
_CreateRoom.scss	…
_CustomRoomTagPanel.scss	…
_FilePanel.scss	Use modern layout in file and notification panel	2021-07-22 16:00:41 +02:00
_GenericErrorPage.scss	…
_GroupFilterPanel.scss	…
_GroupView.scss	…
_HeaderButtons.scss	…
_HomePage.scss	…
_LeftPanel.scss	…
_LeftPanelWidget.scss	…
_MainSplit.scss	…
_MatrixChat.scss	…
_MyGroups.scss	…
_NonUrgentToastContainer.scss	…
_NotificationPanel.scss	Use modern layout in file and notification panel	2021-07-22 16:00:41 +02:00
_RightPanel.scss	Move RightPanel animation to compositor	2021-07-02 15:23:03 +01:00
_RoomDirectory.scss	…
_RoomSearch.scss	…
_RoomStatusBar.scss	…
_RoomView.scss	move file drop image animation to compositor	2021-07-02 15:23:27 +01:00
_ScrollPanel.scss	…
_SearchBox.scss	…
_SpacePanel.scss	Iterate PR	2021-07-28 19:33:07 +01:00
_SpaceRoomDirectory.scss	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096	2021-07-28 17:45:15 +01:00
_SpaceRoomView.scss	Update feedback prompt to match designs	2021-07-28 17:56:57 +01:00
_TabbedView.scss	Add dialpad to transfer dialog + various dialpad UI improvements (#6363)	2021-07-15 09:55:58 +01:00
_ToastContainer.scss	…
_UploadBar.scss	…
_UserMenu.scss	…
_ViewSource.scss	…