Michael Telatynski a5468c918e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets ... Conflicts: src/resizer/distributors/collapse.ts src/resizer/distributors/fixed.ts src/resizer/index.ts src/resizer/item.ts src/resizer/resizer.ts src/resizer/sizer.ts		2020-10-21 09:56:22 +01:00
..
auth	…
_AutoHideScrollbar.scss	…
_CompatibilityPage.scss	…
_ContextualMenu.scss	…
_CreateRoom.scss	…
_CustomRoomTagPanel.scss	Fix variable naming	2020-10-14 16:30:38 -06:00
_FilePanel.scss	…
_GenericErrorPage.scss	…
_GroupFilterPanel.scss	Fix variable naming	2020-10-14 16:30:38 -06:00
_GroupView.scss	…
_HeaderButtons.scss	…
_HomePage.scss	…
_LeftPanel.scss	Fix variable naming	2020-10-14 16:30:38 -06:00
_MainSplit.scss	…
_MatrixChat.scss	Remove stale things	2020-10-13 12:27:50 +01:00
_MyGroups.scss	…
_NonUrgentToastContainer.scss	…
_NotificationPanel.scss	…
_RightPanel.scss	…
_RoomDirectory.scss	Fix room directory clipping links in the room's topic	2020-10-02 18:00:58 +02:00
_RoomSearch.scss	…
_RoomStatusBar.scss	…
_RoomView.scss	…
_ScrollPanel.scss	…
_SearchBox.scss	…
_TabbedView.scss	Adjust Settings styles	2020-10-07 20:23:34 +01:00
_ToastContainer.scss	…
_UploadBar.scss	…
_UserMenu.scss	Fix excessive hosting link padding	2020-10-19 12:34:25 +01:00
_ViewSource.scss	…