From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Sat, 26 Jan 2019 17:30:51 +0000 (+0000)
Subject: Merge branch 'hardening/mastodon-rich-media' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=717579330427ed4f78ee578d008818c07106318f;p=akkoma

Merge branch 'hardening/mastodon-rich-media' into 'develop'

rich media: minor hardening

See merge request pleroma/pleroma!717
---

717579330427ed4f78ee578d008818c07106318f