Merge branch 'develop' into 'fix/2411-mutes-api'
authorfeld <feld@feld.me>
Tue, 2 Feb 2021 17:57:58 +0000 (17:57 +0000)
committerfeld <feld@feld.me>
Tue, 2 Feb 2021 17:57:58 +0000 (17:57 +0000)
commitd289ad8579dacdf1459bbbdaf404bfcd042255ae
treeda6bfbe54853ad66dd81763e7b8d3be3b121a2a3
parentc369d2b93028e4dc11f1f2c4cd7380ee0392ccac
parent6a2d3fb9a3775fc0e167c71bb8a8fba3608b2f17
Merge branch 'develop' into 'fix/2411-mutes-api'

# Conflicts:
#   CHANGELOG.md
#   docs/development/API/differences_in_mastoapi_responses.md
CHANGELOG.md
docs/development/API/differences_in_mastoapi_responses.md
lib/pleroma/web/api_spec/operations/account_operation.ex
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs