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

5.9 KiB

Raw Blame History

View Raw