Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 6 Oct 2019 08:43:49 +0000 (11:43 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 6 Oct 2019 08:43:49 +0000 (11:43 +0300)
commit06b3bb54c5567fe82ad2a015673fffba667997ee
tree84bde8abcef86ef398eef0afdc9ae77e5f464bf1
parent64095961fe490029886cae358683532ea65bf2c0
parent9e34919dcdbeedf8eb623dc86b05f63ef44d8859
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub_controller.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
lib/pleroma/web/oauth/oauth_controller.ex
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
test/web/oauth/oauth_controller_test.exs