[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 19 Sep 2019 07:59:09 +0000 (10:59 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 19 Sep 2019 07:59:09 +0000 (10:59 +0300)
commit6f67aed3acf557bb1e37415af82acd97e46c9ac4
tree9155b5d55ad25d6e82ea1d365dd973addc30d1da
parente4f3d7f69d5d3db787f8b4906cacc673e2f970f1
parentf95a2b2cda236f7c0e5ced2a4698e2b10d99fa53
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
CHANGELOG.md
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
lib/pleroma/web/router.ex
test/plugs/oauth_scopes_plug_test.exs
test/web/mastodon_api/controllers/mastodon_api_controller/update_credentials_test.exs
test/web/oauth/oauth_controller_test.exs
test/web/twitter_api/util_controller_test.exs