From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Tue, 29 Jan 2019 05:11:08 +0000 (+0000)
Subject: Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ebb3496386c1e195b48bcdc9d72c4c30e60fe340;p=akkoma

Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'

Rich Media support, part 2.

See merge request pleroma/pleroma!719
---

ebb3496386c1e195b48bcdc9d72c4c30e60fe340