imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
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;