Michael Telatynski 4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 ... Conflicts: src/components/structures/RoomView.tsx src/components/views/right_panel/UserInfo.tsx		2021-06-03 08:42:05 +01:00
..
BaseCard.tsx	Added optional refireParams	2021-01-30 08:51:26 +01:00
EncryptionInfo.tsx	Tweak cross-signing copy	2021-03-26 11:13:39 +00:00
EncryptionPanel.tsx	Fix Encryption Panel close button clashing with Base Card	2020-09-29 10:11:04 +01:00
GroupHeaderButtons.tsx	delint imports	2021-06-03 08:41:22 +01:00
HeaderButton.tsx	delint imports	2021-06-03 08:41:22 +01:00
HeaderButtons.tsx	delint imports	2021-06-03 08:41:22 +01:00
PinnedMessagesCard.tsx	When pinning a message automatically mark it as read	2021-05-26 15:40:24 +01:00
RoomHeaderButtons.tsx	delint imports	2021-06-03 08:41:22 +01:00
RoomSummaryCard.tsx	prevent reflow in app when accessing window dimensions	2021-05-25 10:28:43 +01:00
UserInfo.tsx	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606	2021-06-03 08:42:05 +01:00
VerificationPanel.tsx	Batch of views getting replaceableComponent decorators	2021-03-08 20:23:46 -07:00
WidgetCard.tsx	prevent reflow in app when accessing window dimensions	2021-05-25 10:28:43 +01:00