Merge branch 'develop' into openapi/account
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 20 Apr 2020 14:37:45 +0000 (18:37 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 20 Apr 2020 14:40:02 +0000 (18:40 +0400)
commit736fead494f6140871919308e872bb6fe5b7a196
tree13d9a869a8c551e7d9bb1ad07ca87f7123d74544
parent163341857a726e8d74b6ddcd1230579e4c36a1b5
parent28165dad3ac02a6d3ba4b0cda51992a1831515dd
Merge branch 'develop' into openapi/account
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/twitter_api/twitter_api.ex
mix.exs
mix.lock
test/web/mastodon_api/controllers/account_controller_test.exs