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	…
_components.scss	Add a simple edit dialog for communities	2020-08-31 10:52:08 -06:00
_font-sizes.scss	…
_font-weights.scss	…
rethemendex.sh	…