From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Tue, 23 Jun 2020 03:04:27 +0000 (+0000)
Subject: Merge branch '@doc/apc2s-upload-media' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3875a507d4b52df7edbda376d3ed31ad52241ac5;p=akkoma

Merge branch '@doc/apc2s-upload-media' into 'develop'

ActivityPubController: Update upload_media @doc

See merge request pleroma/pleroma!2673
---

3875a507d4b52df7edbda376d3ed31ad52241ac5