Merge branch 'master' into erp5-component
[slapos.git] / software / pulse /
drwxr-xr-x   ..
-rw-r--r-- 858 instance.cfg
-rw-r--r-- 4344 software.cfg