Commit d5a2ff5f authored by Jacob Vosmaer's avatar Jacob Vosmaer

Fix merge error :(

parent cf8f25bc
...@@ -105,7 +105,7 @@ var httpRoutes = [...]httpRoute{ ...@@ -105,7 +105,7 @@ var httpRoutes = [...]httpRoute{
// from downloading it we make sure requests to /uploads/ do _not_ pass // from downloading it we make sure requests to /uploads/ do _not_ pass
// through handleServeFile. // through handleServeFile.
httpRoute{"", regexp.MustCompile(`^/uploads/`), httpRoute{"", regexp.MustCompile(`^/uploads/`),
handleRailsError(documentRoot, handleRailsError(documentRoot, developmentMode,
proxyRequest, proxyRequest,
), ),
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment