Merge branch 'develop' into openapi/account
authorEgor Kislitsyn <egor@kislitsyn.com>
Wed, 22 Apr 2020 16:18:12 +0000 (20:18 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Wed, 22 Apr 2020 16:18:12 +0000 (20:18 +0400)
commit6c26feed01b2e836e7ebdefe9683ddb03cb57757
tree4b143a6708d405e5fc6ebf69910c9ae18066502b
parent11433cd38d9761ddf3fdb94f8c39526910b975c1
parent28f8fcf8b034223209ec451d0c2c836124ec93f4
Merge branch 'develop' into openapi/account
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/api_spec/operations/account_operation.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
test/web/mastodon_api/controllers/account_controller_test.exs