Michael Telatynski c784039cf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets ... Conflicts: src/components/views/right_panel/WidgetCard.tsx src/stores/WidgetStore.ts		2020-10-07 10:04:45 +01:00
..
BaseCard.tsx	Fix Encryption Panel close button clashing with Base Card	2020-09-29 10:11:04 +01:00
EncryptionInfo.tsx	Fix eslint ts override tsx matching and delint	2020-08-29 01:11:08 +01:00
EncryptionPanel.tsx	Fix Encryption Panel close button clashing with Base Card	2020-09-29 10:11:04 +01:00
GroupHeaderButtons.tsx	Fix HeaderButtons handler bindings	2020-09-04 12:14:43 +01:00
HeaderButton.tsx	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting	2020-08-04 15:04:56 +01:00
HeaderButtons.tsx	Create new right panel cards	2020-09-08 15:42:31 +01:00
RoomHeaderButtons.tsx	re-order top right buttons	2020-09-09 11:06:15 +01:00
RoomSummaryCard.tsx	Rebuild the room summary card's widgets section	2020-09-30 17:08:41 +01:00
UserInfo.tsx	Update src/components/views/right_panel/UserInfo.tsx	2020-10-06 22:49:50 +01:00
VerificationPanel.tsx	Fix eslint ts override tsx matching and delint	2020-08-29 01:11:08 +01:00
WidgetCard.tsx	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets	2020-10-07 10:04:45 +01:00