Merge branch 'master' into erp5-component
[slapos.git] / software / xaraya /
drwxr-xr-x   ..
-rw-r--r-- 791 instance.cfg
-rw-r--r-- 1210 software.cfg