Merge branch 'iss-930-media' into 'develop'
authorfeld <feld@feld.me>
Fri, 30 Aug 2019 15:23:15 +0000 (15:23 +0000)
committerfeld <feld@feld.me>
Fri, 30 Aug 2019 15:23:15 +0000 (15:23 +0000)
commit6d33c89c4d27a1b52e69e1c14b408726410a6326
tree0f966c482a66bbd31224b60b033845e0c7bf9acc
parenta7202b52e0e39b14a9fe521b689208655df4aea8
parent99b4847da3244a0d023ae25b2669afb07a4eda4f
Merge branch 'iss-930-media' into 'develop'

Fix missing changes in pleroma/pleroma!1197

See merge request pleroma/pleroma!1613