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

Conflicts: src/components/views/room_settings/AliasSettings.tsx
2021-06-22 22:02:09 +01:00
parent 5dc542f189 c316eb841a
commit 1286be1ffb
182 changed files with 3830 additions and 1987 deletions
@@ -73,7 +73,7 @@ limitations under the License.
        }
    }

-    .mx_FormButton {
+    .mx_AccessibleButton {
        padding: 8px 22px;
        margin-left: auto;
        display: block;