Merge branch 'develop' into travis/sso-uia

2020-03-30 14:56:52 -06:00
parent 1e30bdb739 930f93b974
commit b35356833f
51 changed files with 500 additions and 159 deletions
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -145,7 +145,6 @@ export const PasswordAuthEntry = createReactClass({
                <p>{ _t("Confirm your identity by entering your account password below.") }</p>
                <form onSubmit={this._onSubmit} className="mx_InteractiveAuthEntryComponents_passwordSection">
                    <Field
-                        id="mx_InteractiveAuthEntryComponents_password"
                        className={passwordBoxClass}
                        type="password"
                        name="passwordField"