• Julien Muchembled's avatar
    Merge branch 'master' into erp5-cluster · 6bbb61a8
    Julien Muchembled authored
    Dropped commit 971d0bb7
    ("erp5: Make possible extent the list of initial business templates to install").
    
    Conflicts:
    	stack/erp5/buildout.cfg
    	stack/erp5/instance-erp5-cluster.cfg.in
    	stack/erp5/instance-erp5-single.cfg.in
    	stack/erp5/instance.cfg.in
    6bbb61a8
buildout.cfg 19.2 KB