Commit 45627dde authored by lain's avatar lain
Browse files

Merge branch 'develop' into 'develop'

Fix failure to serve media from custom upload path

See merge request !95
parents d70d1c42 033771d9
Pipeline #1101 passed with stage
in 2 minutes and 48 seconds