Merge branch 'master' into 14715-keepprox-config
[arvados.git] / sdk / python / tests / nginx.conf
2015-04-20 Tom Clegg5416: Run arv-git-httpd and nginx ssl proxy in test...