# Conflicts:
#   CHANGELOG.md

Fix Mastodon interface link in documentation, fixes #2622

Closes #2622

See merge request !3391

Fix ConcurrentLimiter settings via AdminAPI

See merge request !3390

Add ConcurrentLimiter to module_name?/1 and apply string_to_elixir_types/1 to search_opts keys during update_or_create/1

Fix URL to custom instance thumbnail

Closes #2611

See merge request !3388

Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE

Fix CHANGELOG entry meant for next release

See merge request !3387

Revert "Merge branch 'patch-fix-open-api-spec' into 'develop'"

See merge request !3385

This reverts merge request !3382

object_validator: Refactor most of validate/2 to a generic block

See merge request !3383

OpenAPI: Fix `date-time` being specified as an `integer` in OpenAPI spec (when it should be a `string`) in AccountCreateResponse

See merge request !3382

Upstream/mrf followbot

See merge request !3060