From: kaniini <nenolod@gmail.com>
Date: Thu, 31 Jan 2019 16:22:26 +0000 (+0000)
Subject: Merge branch 'fix/rich-media-disable-in-config' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=fb9730010e794a7f80c94b4320fd0591f2e7c93c;p=akkoma

Merge branch 'fix/rich-media-disable-in-config' into 'develop'

Make rich media support toggleable

See merge request pleroma/pleroma!748
---

fb9730010e794a7f80c94b4320fd0591f2e7c93c