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

 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
This commit is contained in:
Michael Telatynski
2021-05-06 13:06:50 +01:00
37 changed files with 828 additions and 282 deletions
+1 -1
View File
@@ -21,7 +21,7 @@ progress.mx_ProgressBar {
appearance: none;
border: none;
@mixin ProgressBarBorderRadius "6px";
@mixin ProgressBarBorderRadius 6px;
@mixin ProgressBarColour $progressbar-fg-color;
@mixin ProgressBarBgColour $progressbar-bg-color;
::-webkit-progress-value {