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-01-22 11:05:25 +00:00
2020-11-25 11:38:43 +00:00
2017-06-01 21:10:32 +02:00
2020-09-15 13:19:47 +01:00
2016-10-11 14:20:40 +01:00
2020-01-09 17:23:27 -07:00
2019-12-17 11:47:01 +00:00
2020-11-05 16:27:41 +00:00