Michael Telatynski f38cd38bd3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740
 Conflicts:
	src/components/structures/TimelinePanel.js
	src/components/views/context_menus/MessageContextMenu.js
	src/components/views/right_panel/UserInfo.tsx
	src/dispatcher/actions.ts
2021-06-17 15:31:06 +01:00
..
2021-05-18 11:58:15 +01:00
2021-06-07 10:57:11 +01:00
2021-06-05 01:16:52 -04:00
2021-06-07 11:20:35 +01:00
2021-05-10 17:36:33 +01:00
2021-05-14 14:22:31 -06:00
2021-06-01 11:04:45 +01:00
2021-05-18 16:24:38 +01:00
2021-06-01 22:21:04 -06:00
2021-06-07 11:03:39 +01:00
2021-06-01 22:21:04 -06:00