From: kaniini <ariadne@dereferenced.org>
Date: Sun, 14 Jul 2019 09:53:42 +0000 (+0000)
Subject: Merge branch 'rich_media_parsers_configurable' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=9f211838eca3793bac8bbb6b64f200a8a6c8d29f;hp=9f211838eca3793bac8bbb6b64f200a8a6c8d29f;p=akkoma

Merge branch 'rich_media_parsers_configurable' into 'develop'

parsers configurable

See merge request pleroma/pleroma!1400
---