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)
commit45627dde17a4093775e770e83bffbfec4e1b6759
tree086ae0eb1732ec22cc1e7cd9dbd6bd015c59b833
parentd70d1c427a29411f2b47789f91894cd08f91ba6e
parent033771d9f186012a066d8b42152a18076651171f
Merge branch 'develop' into 'develop'

Fix failure to serve media from custom upload path

See merge request pleroma/pleroma!95