Merge remote-tracking branch 'origin/master' into lamp
[slapos.git] / software / web2project /
drwxr-xr-x   ..
-rw-r--r-- 503 instance.cfg
-rw-r--r-- 772 software.cfg