Michael Telatynski cd65bdc799 Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot ...

 Conflicts:

	src/components/views/rooms/RoomBreadcrumbs.js

	src/components/views/rooms/RoomTile.js

2020-04-17 12:58:54 +01:00

..

strings

Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot

2020-04-17 12:58:54 +01:00