Merge branch 'develop' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 5 Apr 2018 10:54:07 +0000 (10:54 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 5 Apr 2018 10:54:07 +0000 (10:54 +0000)
Fix failure to serve media from custom upload path

See merge request pleroma/pleroma!95


Trivial merge