• Kazuhiko Shiozaki's avatar
    Merge branch 'erp5' into erp5-cluster · 18e13b9c
    Kazuhiko Shiozaki authored
    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
buildout.cfg 18 KB