Michael Telatynski bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets ...

 Conflicts:

	src/components/views/elements/AppTile.js

	src/utils/WidgetUtils.ts

2020-10-19 20:50:16 +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

_LeftPanelWidget.scss

Implement Left Panel User Widget

2020-09-24 09:28:49 +01:00

_MainSplit.scss

…

_MatrixChat.scss

…

_MyGroups.scss

…

_NonUrgentToastContainer.scss

…

_NotificationPanel.scss

Fix indentation

2020-09-17 10:44:58 -06:00

_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

Document some of the magic values

2020-09-17 10:44:18 -06:00

_ScrollPanel.scss

…

_SearchBox.scss

…

_TabbedView.scss

Adjust Settings styles

2020-10-07 20:23:34 +01:00

_ToastContainer.scss

…

_UploadBar.scss

…

_UserMenu.scss

…

_ViewSource.scss

…