webserver/nginx/files/warpinfra · b8f10823912cc48c08ebf0524e7b57287c632080 · infrastruktur / ansible-warpzone

Sep 03, 2016

Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone · b8f10823

void authored Sep 03, 2016

# Conflicts:
#	webserver/docker_warpinfra/files/Dockerfile
#	webserver/docker_warpinfra/files/entrypoint.sh
#	webserver/docker_warpinfra/tasks/main.yml
#	webserver/nginx/files/warpinfra
#	webserver/nginx/tasks/main.yml

b8f10823

Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone

void authored Sep 03, 2016

# Conflicts:
#	webserver/docker_warpinfra/files/Dockerfile
#	webserver/docker_warpinfra/files/entrypoint.sh
#	webserver/docker_warpinfra/tasks/main.yml
#	webserver/nginx/files/warpinfra
#	webserver/nginx/tasks/main.yml