Michael Telatynski 9eb0986353 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 ...

 Conflicts:

	src/i18n/strings/en_EN.json

2021-07-30 11:34:52 +01:00

..

structures

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

2021-07-30 11:34:52 +01:00

views

Appease linter

2021-07-30 09:19:34 +02:00

_common.scss

Inherit font-family

2021-06-26 20:53:14 +02:00

_components.scss

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

2021-07-30 11:34:52 +01:00

_font-sizes.scss

…

_font-weights.scss

…

rethemendex.sh

…