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

 Conflicts:
	src/stores/SpaceStore.tsx
This commit is contained in:
Michael Telatynski
2021-07-22 12:44:27 +01:00
52 changed files with 2572 additions and 2251 deletions

View File

@@ -20,7 +20,8 @@ limitations under the License.
margin-right: 0;
margin-bottom: 8px;
padding-left: 10px;
border-left: 4px solid $button-bg-color;
border-left: 2px solid $button-bg-color;
border-radius: 2px;
.mx_ReplyThread_show {
cursor: pointer;