Michael Telatynski 66fce64ee0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 ...

 Conflicts:

	package.json

	yarn.lock

2021-06-14 21:39:06 +01:00

..

structures

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282

2021-06-14 21:39:06 +01:00

views

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282

2021-06-14 21:39:06 +01:00

_common.scss

Add CSS containement rules for shorter reflow operations

2021-06-01 11:26:32 +01:00

_components.scss

Merge branch 'develop' into improved-forwarding-ui

2021-06-05 11:04:17 -04:00

_font-sizes.scss

…

_font-weights.scss

…

rethemendex.sh

…