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)
commitb7001ea9e72947596b60e080768be10b4cbae82b
treeeda8c988ce1a6a81f9d8275a07caed33aac78e1e
parentd93789dfde3c44c76a56732088a897ddddfe9716
parent18cac1e36bd91e1554de1f495a7f178b27b2fbc3
Merge branch 'feature/media-description' into 'develop'

Feature/media description

Closes #174

See merge request pleroma/pleroma!255