Merge branch 'master' into erp5-component
[slapos.git] / software / ezpublish /
drwxr-xr-x   ..
-rw-r--r-- 545 instance.cfg
-rw-r--r-- 2805 software.cfg