Merge branch '@doc/apc2s-upload-media' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 23 Jun 2020 03:04:27 +0000 (03:04 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 23 Jun 2020 03:04:27 +0000 (03:04 +0000)
commit3875a507d4b52df7edbda376d3ed31ad52241ac5
treeaf5e48e5d632541ac22df8932dfcc566e71be1cb
parentd21ef5e66bd0d7601b06dc7e59f3ee0fcd9e04bb
parentc116b6d6d6e4b12d9d751481926183f19cdb5248
Merge branch '@doc/apc2s-upload-media' into 'develop'

ActivityPubController: Update upload_media @doc

See merge request pleroma/pleroma!2673