Michael Telatynski 667c129ebc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 ...

 Conflicts:

	src/components/structures/ScrollPanel.js

	src/components/views/rooms/AppsDrawer.js

2020-09-07 14:33:57 +01:00

..

structures

Use a different border variable for compatibility with custom themes

2020-08-31 11:20:28 -06:00

views

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785

2020-09-07 14:33:57 +01:00

_common.scss

Merge pull request #5056 from matrix-org/joriks/style-fighting

2020-08-12 15:21:06 +01:00

_components.scss

Add a simple edit dialog for communities

2020-08-31 10:52:08 -06:00

_font-sizes.scss

Use rem to guard against font scaling breakages

2020-07-16 20:15:28 +05:30

_font-weights.scss

Iterate PR, tweak margins

2020-08-18 12:00:56 +01:00

rethemendex.sh

Remove sort and include new scss file in components

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