stack/erp5/instance-cloudoo.cfg.in · 725d94d769657e15e02a7852317b14092be737fd · Kasra Jamshidi / slapos

You need to sign in or sign up before continuing.

Merge branch 'master' into erp5-cluster · 1bea879b

Julien Muchembled authored Nov 19, 2014

Conflicts:
	software/neoppod/software.cfg
	stack/erp5/buildout.cfg
	stack/erp5/instance-erp5-cluster.cfg.in
	stack/erp5/instance-erp5-single.cfg.in
	stack/erp5/instance-zope.cfg.in

1bea879b

instance-cloudoo.cfg.in 3.67 KB

Replace instance-cloudoo.cfg.in