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
..
structures	Fix read marker visibility for grouped events	2020-04-03 01:14:31 +01:00
views	Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks	2020-05-23 11:12:58 +01:00
stub-component.js	Appease the linter	2020-01-13 13:28:33 -07:00