Michael Telatynski 880e16aaa2 Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks
 Conflicts:
	src/components/views/avatars/BaseAvatar.js
	test/components/views/messages/TextualBody-test.js
2020-05-23 11:12:58 +01:00
..
2020-01-22 11:05:25 +00:00
2019-12-16 11:12:48 +00:00
2017-06-01 21:10:32 +02:00
2019-12-17 11:47:01 +00: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