Develop #2

Merged kalle merged 3 commits into docker:master from docker:develop on 21 Mar 2018

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View docker-compose.yml

Ignore Space Show notes View jenkins.conf