stack/erp5/instance.cfg.in · 18e13b9c112627199b9a4aa0eeb80c28d3e1ec0a · Thomas Leymonerie / slapos

Merge branch 'erp5' into erp5-cluster · 18e13b9c

Kazuhiko Shiozaki authored Jan 15, 2014

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

18e13b9c

instance.cfg.in 7.65 KB

Replace instance.cfg.in