Merge branch 'feature/media-description' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Wed, 18 Jul 2018 08:52:11 +0000 (08:52 +0000)
committerlambda <pleromagit@rogerbraun.net>
Wed, 18 Jul 2018 08:52:11 +0000 (08:52 +0000)
Feature/media description

Closes #174

See merge request pleroma/pleroma!255


Trivial merge