Merge branch 'erp5'
Conflicts: component/automake/buildout.cfg component/ca-certificates/buildout.cfg component/openssl/buildout.cfg software/lamp-template/instance.cfg stack/slapos.cfg
Showing
component/cloudooo/buildout.cfg
100644 → 100755
component/groff/buildout.cfg
0 → 100644
component/m4/drop.gets.patch
0 → 100644
component/webp/buildout.cfg
0 → 100644
setup.py
100644 → 100755
software/cloudooo/software.cfg
100644 → 100755
software/erp5/README.txt
0 → 100644
stack/cloudooo.cfg
100644 → 100755
stack/erp5/instance.cfg.in
0 → 100644
stack/erp5/zope.conf.in
0 → 100644
Please register or sign in to comment