Merge master into grid-computing
[slapos.git] / software / tiki /
drwxr-xr-x   ..
-rw-r--r-- 545 instance.cfg
-rw-r--r-- 2774 software.cfg