Merge remote-tracking branch 'pleroma/develop' into cycles-constants
authorAlex Gleason <alex@alexgleason.me>
Tue, 1 Jun 2021 16:32:30 +0000 (11:32 -0500)
committerAlex Gleason <alex@alexgleason.me>
Tue, 1 Jun 2021 16:33:11 +0000 (11:33 -0500)
commitc435de426d045118ed7be3d77f659f349d2d2245
treea4cafffc0aa601c994dfd4c3a480dfd9dd5bfa3b
parent10dfe814795f16d6c32f5b6a7421e3e7c597f1ad
parent75b94a2f352ea255b0785d0f3ba2c849c8355e04
Merge remote-tracking branch 'pleroma/develop' into cycles-constants
lib/pleroma/web/activity_pub/builder.ex
lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/common_api/utils.ex
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs