Commit 2f23ae5b authored by lain's avatar lain
Browse files

Merge branch 'pr-upstream-http-proxy' into 'develop'

Pr upstream http proxy

See merge request !43
parents 189e9d63 066fe1a6
Pipeline #547 failed with stage
in 2 minutes and 18 seconds