Merge branch 'develop' into fix/15142/fix-grecaptcha-race-condition

* develop: (141 commits)
  delint
  Doc some values
  Remove useless image reference
  Revert accidental renaming of dispatcherRef
  Fix event highlighthing
  Move some code around for clarity
  Constrain emoji skins type even further
  Delint
  i18n irc and fix lint from merge conflict
  Remove unwanted coma in EventTile
  fix three lints
  lint fix
  not sure how these happened :/
  remove unused prop
  Update eslint-plugin-matrix-org
  Fix placeholder centering
  Make emoji skins type more specific
  Rename some variables since their purpose has changed
  Conform to new react and typescript eslint rules
  Apply code review suggestions
  ...
This commit is contained in:
Dariusz Niemczyk 2021-07-20 17:33:05 +02:00
commit 44b8bace47
No known key found for this signature in database
GPG key ID: 0AD2F70C94CA5B03
317 changed files with 4473 additions and 2961 deletions

View file

@ -137,9 +137,9 @@ export default class CaptchaForm extends React.Component<ICaptchaFormProps, ICap
return (
<div ref={this.recaptchaContainer}>
<p>{_t(
<p>{ _t(
"This homeserver would like to make sure you are not a robot.",
)}</p>
) }</p>
<div id={DIV_ID} />
{ error }
</div>