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

Conflicts: src/settings/Settings.ts src/settings/UIFeature.ts
2020-09-17 13:42:27 +01:00
parent c11abb74e0 1e9e0dee87
commit ae44a6d1fa
18 changed files with 219 additions and 103 deletions
@@ -18,6 +18,12 @@ limitations under the License.
    display: flex;
    flex-direction: column;
    align-items: center;
+
+    &.mx_WelcomePage_registrationDisabled {
+        .mx_ButtonCreateAccount {
+            display: none;
+        }
+    }
 }

 .mx_Welcome .mx_AuthBody_language {