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

..

structures

disable password reset button when spinning

2020-04-15 14:07:37 +01:00

views

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

_common.scss

Use variables for the rem values.

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

_components.scss

Merge pull request #4406 from matrix-org/bwindels/completesecuritywithoutspinner

2020-04-14 15:54:44 +00:00

_font-sizes.scss

Change copyright

2020-04-02 13:35:12 +01:00

rethemendex.sh

Remove sort and include new scss file in components

2020-04-02 13:42:59 +01:00