[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 17 Sep 2019 19:53:26 +0000 (22:53 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 17 Sep 2019 19:53:26 +0000 (22:53 +0300)
commit01c1078015c1ddbaa195125034489a14233df206
tree01c63b7d6a8040decf6e0cd1630b715ca2cb29c6
parent76068873dbf9da191dd2487158ca88df198b811a
parent79376abae347a5039931f57c581074b6da859827
[#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/activity_pub/activity_pub_controller.ex
lib/pleroma/web/admin_api/admin_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