Merge remote-tracking branch 'upstream/develop' into patch-add-image-description

Status Job ID Name Coverage
  Lint
failed #3919
lint

00:02:04

 
  Test
skipped #3920
unit-testing
 
Name Stage Failure
failed
lint Lint
$ MIX_ENV=test mix format --check-formatted
You may want to create test.secret.exs to declare custom database connection parameters.
** (Mix) mix format failed due to --check-formatted.
The following files were not formatted:

* test/web/mastodon_api/mastodon_api_controller_test.exs
* lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

ERROR: Job failed: exit code 1