Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 15 Apr 2020 16:20:34 +0000 (19:20 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 15 Apr 2020 16:20:34 +0000 (19:20 +0300)
commitbedf92e064ec96f0b9bb95c2263616a2fe49017d
treef07832cb01dcc5574c6be537c78e5e51fbb3fda6
parentfc81e5a49c34224e07e85f490a30f92db0835d45
parentb1c1d2e5e1e1c43a068a7223f9ba69c689c878a3
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
lib/pleroma/web/router.ex
test/web/pleroma_api/controllers/pleroma_api_controller_test.exs