From: lambda <pleromagit@rogerbraun.net>
Date: Thu, 5 Apr 2018 10:54:07 +0000 (+0000)
Subject: Merge branch 'develop' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=45627dde17a4093775e770e83bffbfec4e1b6759;p=akkoma

Merge branch 'develop' into 'develop'

Fix failure to serve media from custom upload path

See merge request pleroma/pleroma!95
---

45627dde17a4093775e770e83bffbfec4e1b6759