salt branch
up
salt branch
up
up
Update PILLAR.sample.sls
Merge remote-tracking branch 'remotes/origin/zope-salt' into zope-project

Conflicts:
	.gitignore
	README.rst
mode
Use makina-states APIV2

cc @ebrehault @jpcw @toutpt @gagaro @numhahell @davisp1
This is how to deploy zope with makina-states minus the leftover bugs :)
cleanup
ensure supervisor exe exeutable
Update PILLAR.sample
Update PILLAR.sample
Update 700_reverseproxy.sls