Merge branch 'master' into ho-docker

This commit is contained in:
Henry Oswald 2018-12-04 15:22:03 +00:00
commit fa3dd21d0c

View file

@ -29,7 +29,7 @@ module.exports =
apis: apis:
web: web:
url: "http://#{process.env['WEB_API_HOST'] or process.env['WEB_HOST'] or "localhost"}:3000" url: "http://#{process.env['WEB_HOST'] or "localhost"}:#{process.env['WEB_PORT'] or 3000}"
user: "sharelatex" user: "sharelatex"
pass: "password" pass: "password"
documentupdater: documentupdater: