• Cédric de Saint Martin's avatar
    Merge branch 'erp5' · 320a228b
    Cédric de Saint Martin authored
    Conflicts:
    	component/automake/buildout.cfg
    	component/ca-certificates/buildout.cfg
    	component/openssl/buildout.cfg
    	software/lamp-template/instance.cfg
    	stack/slapos.cfg
    320a228b
buildout.cfg 833 Bytes