Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 6 Mar 2020 08:48:30 +0000 (11:48 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 6 Mar 2020 08:48:30 +0000 (11:48 +0300)
commit027714b519cca63ac943369d0bcc9534ba448a80
treeab331c60efe243bd6eb79c95b67dc797bb165078
parent40765875d41f181b4ac54a772b4c61d6afc0bc34
parent47604907c9d2379d0883d63bc7add5782cc25d63
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
lib/pleroma/plugs/federating_plug.ex
lib/pleroma/plugs/static_fe_plug.ex
lib/pleroma/web/activity_pub/activity_pub_controller.ex
lib/pleroma/web/ostatus/ostatus_controller.ex
test/plugs/oauth_plug_test.exs
test/web/activity_pub/activity_pub_controller_test.exs
test/web/ostatus/ostatus_controller_test.exs