Merge branch 'develop' into 'feature/local-only-scope'
authorminibikini <egor@kislitsyn.com>
Tue, 27 Oct 2020 18:59:19 +0000 (18:59 +0000)
committerminibikini <egor@kislitsyn.com>
Tue, 27 Oct 2020 18:59:19 +0000 (18:59 +0000)
commit1bfd8528bbc71c8c34253eb245de7df498064fb4
tree97387260c85bb6b5505924de806110d8f71eb3fc
parent18a91d85e59eb67a2d58a28aae732c34b75ebe97
parent5aff4799515c141cb0a42686733b2f40faba6f86
Merge branch 'develop' into 'feature/local-only-scope'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md
lib/pleroma/web/common_api/utils.ex
test/pleroma/web/common_api_test.exs
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs