Merge remote-tracking branch 'upstream/develop' into restrict-origin
authorAlex Gleason <alex@alexgleason.me>
Thu, 8 Oct 2020 22:24:09 +0000 (17:24 -0500)
committerAlex Gleason <alex@alexgleason.me>
Thu, 8 Oct 2020 22:24:09 +0000 (17:24 -0500)
commit3f9263fb16ad519d2dd45106549a8ba42b68fc1f
treea48eb564f7f037a876a4d2131f8571aa33702b22
parent24ce9c011caf7401fb261c7df4196b2ef9ba3d90
parent74be4de3f6c2c34447029649526637411acfa9f3
Merge remote-tracking branch 'upstream/develop' into restrict-origin
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
test/web/admin_api/controllers/admin_api_controller_test.exs
test/web/mastodon_api/controllers/timeline_controller_test.exs