[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 15 Sep 2019 15:52:27 +0000 (18:52 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 15 Sep 2019 15:52:27 +0000 (18:52 +0300)
commitefbc2edba17a7ee2d3e15bca5fa4f6cf8b4b5116
tree086f3bb1ae6ca2fbb9909e69297a7dabea9061fb
parente6f43a831bdd2a381ed4de493344886f312f9a38
parent9c64a25713790fefa8b5c419aeadf55113c17073
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
# lib/pleroma/web/router.ex
lib/pleroma/web/activity_pub/activity_pub_controller.ex
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/web/twitter_api/util_controller_test.exs