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

..

css

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

fonts

upgrade nunito from 3.500 to 3.504

2019-11-20 16:36:27 +00:00

img

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

media

move default ringtones over from riot-web

2018-04-12 00:25:36 +01:00

themes

Use variables for the rem values.

2020-03-31 15:26:23 +01:00