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
..
dialogs	Fixxy	2020-04-16 14:09:41 +01:00
elements	…
groups	…
messages	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
rooms	Merge branch 'travis/dispatcher-types' into travis/room-list-2	2020-05-14 13:40:37 -06:00