Merge remote-tracking branch 'upstream/develop' into earmark
authorAlex Gleason <alex@alexgleason.me>
Fri, 30 Apr 2021 18:17:03 +0000 (13:17 -0500)
committerAlex Gleason <alex@alexgleason.me>
Fri, 30 Apr 2021 18:17:03 +0000 (13:17 -0500)
commit52fc59f125c10ad73b9fd1a0639b6dc5681776ca
tree7de32329acbdd4bdf5c753678a2d459c61b58d80
parenta8fa00ef666f574aec8048626aed78a7d62e6915
parent377f84f3678f9c2541fbd4a200cd93c5ab0dea24
Merge remote-tracking branch 'upstream/develop' into earmark
lib/pleroma/formatter.ex
lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
lib/pleroma/web/common_api/utils.ex
mix.exs
mix.lock
test/pleroma/web/common_api/utils_test.exs
test/pleroma/web/common_api_test.exs