Merge remote-tracking branch 'upstream/develop' into restrict-domain
authorAlex Gleason <alex@alexgleason.me>
Wed, 5 Aug 2020 18:08:31 +0000 (13:08 -0500)
committerAlex Gleason <alex@alexgleason.me>
Wed, 5 Aug 2020 18:08:31 +0000 (13:08 -0500)
commitcc196e2cd57966889021342405ebc8fd0763e83a
tree232051460624a0fd0720ed04cc5512208ce1989b
parentad9c925efb77287316f5dbac26f6a1b16662910a
parent7755f49e281e4990db5317b33d6b8e0d12982e0c
Merge remote-tracking branch 'upstream/develop' into restrict-domain
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/admin_api/controllers/admin_api_controller_test.exs