Merge remote-tracking branch 'origin/erp5'
[slapos.git] / software / tiki /
drwxr-xr-x   ..
-rw-r--r-- 545 instance.cfg
-rw-r--r-- 2770 software.cfg