Merge branch 'master' into erp5-component
[slapos.git] / software / lamp-template-static /
drwxr-xr-x   ..
-rw-r--r-- 280 instance.cfg
-rw-r--r-- 2559 software.cfg