Merge branch 'master' into erp5-component
[slapos.git] / software / glpi /
drwxr-xr-x   ..
-rw-r--r-- 502 instance.cfg
-rw-r--r-- 744 software.cfg