Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...

diff --cc lib/pleroma/plugs/federating_plug.ex
Simple merge

diff --cc lib/pleroma/plugs/static_fe_plug.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub_controller.ex
Simple merge

diff --cc lib/pleroma/web/ostatus/ostatus_controller.ex
Simple merge

diff --cc test/plugs/oauth_plug_test.exs
Simple merge

diff --cc test/web/activity_pub/activity_pub_controller_test.exs
Simple merge

diff --cc test/web/ostatus/ostatus_controller_test.exs
Simple merge