Merge branch 'master' into bug-fixes

2026-07-24 13:20:47 +08:00 · 2018-05-07 14:38:55 -04:00
parent 46e5efbd55 0f47378ae3
commit 21e92b92f3
6 changed files with 24 additions and 212 deletions
@@ -67,7 +67,11 @@ class ChangeEmailContentDialog extends React.Component {
              columnDisplay
            />
            <div className={styles.bottomActions}>
-              <Button className={styles.cancel} onClick={this.props.cancel}>
+              <Button
+                className={styles.cancel}
+                onClick={this.props.cancel}
+                type="button"
+              >
                {t('talk-plugin-local-auth.change_email.cancel')}
              </Button>
              <Button className={styles.confirmChanges} type="submit">