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
..
2019-11-21 18:12:32 +01:00
2020-04-07 11:03:49 +01:00
2018-06-27 17:17:44 +01:00
2019-02-08 17:34:01 +00:00
2019-02-08 17:34:01 +00:00
2019-02-08 17:34:01 +00:00
2019-05-15 15:53:02 +01:00
2019-03-05 16:49:12 +00:00
2018-10-23 18:09:21 +02:00
2018-10-23 18:09:21 +02:00
2018-10-24 13:50:58 +02:00
2020-01-09 13:38:47 -07:00
2018-10-23 18:09:21 +02:00
2018-10-23 18:09:21 +02:00
2018-12-19 09:28:33 +00:00
2018-10-23 18:09:21 +02:00
2018-10-23 18:09:21 +02:00
2019-06-25 15:12:30 +01:00
2019-05-15 09:12:53 +01:00
2018-08-21 17:56:28 +01:00
2018-08-21 17:50:59 +01:00
2019-04-04 01:48:41 -07:00
2019-04-04 01:48:41 -07:00