matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-31 13:44:28 +03:00
Code Activity

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

Browse Source 
 Conflicts:
	src/components/views/room_settings/AliasSettings.tsx
This commit is contained in:
Michael Telatynski
2021-06-22 22:02:09 +01:00
parent 5dc542f189 c316eb841a
commit 1286be1ffb
182 changed files with 3830 additions and 1987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/css/views/spaces/_SpaceBasicSettings.scss
View File

@ -73,7 +73,7 @@ limitations under the License.
}
}
.mx_FormButton {
.mx_AccessibleButton {
padding: 8px 22px;
margin-left: auto;
display: block;