From: lambda <pleromagit@rogerbraun.net>
Date: Wed, 18 Jul 2018 08:52:11 +0000 (+0000)
Subject: Merge branch 'feature/media-description' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b7001ea9e72947596b60e080768be10b4cbae82b;hp=18cac1e36bd91e1554de1f495a7f178b27b2fbc3;p=akkoma

Merge branch 'feature/media-description' into 'develop'

Feature/media description

Closes #174

See merge request pleroma/pleroma!255
---