mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-03 20:36:57 +03:00
Code Issues Projects Releases Packages Wiki Activity
element-web/res/css
History
Michael Telatynski 0a209afdc2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 
 Conflicts:
	res/css/structures/_SpaceHierarchy.scss
	src/components/structures/SpaceHierarchy.tsx
	src/i18n/strings/en_EN.json
2021-08-12 11:41:03 +01:00
..
structures Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 2021-08-12 11:41:03 +01:00
views Merge pull request #6543 from matrix-org/t3chguy/fix/18092 2021-08-12 11:28:14 +01:00
_common.scss
_components.scss Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 2021-08-12 11:41:03 +01:00
_font-sizes.scss
_font-weights.scss
rethemendex.sh