Michael Telatynski a52dd57eb2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529 ... Conflicts: package.json yarn.lock		2021-06-15 13:59:54 +01:00
..
dialogs	Merge branch 'develop' into gsouquet/react-17	2021-06-09 12:01:35 +01:00
elements	Improve formatting	2021-04-29 19:57:02 +02:00
groups	Fix tests	2020-01-30 22:28:56 +00:00
messages	Update Enzyme adapter name	2021-06-09 11:57:29 +01:00
rooms	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529	2021-06-15 13:59:54 +01:00