Merge branch 'develop' into openapi/account
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 27 Apr 2020 10:33:00 +0000 (14:33 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 27 Apr 2020 10:33:00 +0000 (14:33 +0400)
commitf1ca917bb0d733445657e0be92440dedc2f8d3c6
tree175db64bc7d9c32bc5c2f2e7b443daa040e4d65c
parent1b06a27746ccbbdec77b7bc1571783a64ade4431
parent01cc93b6873b5c50c0fc54774a3b004bf660e46b
Merge branch 'develop' into openapi/account
docs/API/differences_in_mastoapi_responses.md
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/api_spec/operations/app_operation.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
test/support/conn_case.ex