Michael Telatynski 517b594edc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.1 ... Conflicts: src/components/structures/RightPanel.js		2020-09-08 18:04:24 +01:00
..
BaseCard.tsx	Create new right panel cards	2020-09-08 15:42:31 +01:00
EncryptionInfo.tsx	Fix eslint ts override tsx matching and delint	2020-08-29 01:11:08 +01:00
EncryptionPanel.tsx	Fix shadow-variable errors in EncryptionPanel	2020-07-22 15:14:50 +05:30
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	do the todos	2020-09-08 16:27:09 +01:00
RoomSummaryCard.tsx	update copy	2020-09-08 18:00:21 +01:00
UserInfo.js	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.1	2020-09-08 18:04:24 +01:00
VerificationPanel.tsx	Fix eslint ts override tsx matching and delint	2020-08-29 01:11:08 +01:00
WidgetCard.tsx	do the todos	2020-09-08 16:27:09 +01:00