Michael Telatynski eb25c39318 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
 Conflicts:
	src/i18n/strings/en_EN.json
2020-12-01 16:33:29 +00:00
..
2020-11-24 11:18:11 +00:00
2020-10-14 16:30:38 -06:00
2020-10-13 12:27:50 +01:00
2020-09-17 10:44:58 -06:00
2020-11-19 15:15:31 +00:00
2020-10-07 20:23:34 +01:00