James Cole 11e537810a Merge branch 'develop' into v480 ... * develop: Update Docker files slightly (yes I am a nitpicker). - Fixed copying Dockerfile.amd64 to Dockerfile.arm in the 2nd last commit entrypoint.sh: Wait for DB to start up Misc Optimizations: Changes on Dockerfile* # Conflicts: # .deploy/docker/entrypoint.sh		2019-03-24 14:56:08 +01:00
..
docker	Merge branch 'develop' into v480	2019-03-24 14:56:08 +01:00
heroku	Update config for Romanian.	2019-03-22 18:29:34 +01:00
kubernetes	Move docker files, include kubernetes files.	2018-03-11 18:27:30 +01:00
sandstorm	Refactor script locations to clear up root directory.	2019-02-20 07:04:24 +01:00