Merge remote-tracking branch 'upstream/develop' into attachment-meta
authorAlex Gleason <alex@alexgleason.me>
Thu, 13 May 2021 01:10:52 +0000 (20:10 -0500)
committerAlex Gleason <alex@alexgleason.me>
Thu, 13 May 2021 01:10:52 +0000 (20:10 -0500)
commitff0251105784329d7962652af7a0bf8977564281
tree38a4a69fed26bf54c39b18208672e5e5b8d12100
parent6f0b42656dcce9cd7e4c833be42b6544954ca93b
parent745375bdcf2679ff803dd4ebc4a8313a7b5fb157
Merge remote-tracking branch 'upstream/develop' into attachment-meta
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
test/pleroma/web/mastodon_api/views/status_view_test.exs