Merge branch 'main' into glitch-soc/main

2023-03-26 15:47:12 +02:00
parent 81e85782d1 6e8711ff91
commit 14b0311029
145 changed files with 441 additions and 261 deletions
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@ -32,7 +32,6 @@ const messages = defineMessages({
  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
 });

-export default @injectIntl
 class ComposeForm extends ImmutablePureComponent {

  static contextTypes = {
@ -300,3 +299,5 @@ class ComposeForm extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(ComposeForm);