Merge branch 'master' into slapos
[slapos.git] / software / magento /
drwxr-xr-x   ..
-rw-r--r-- 502 instance.cfg
-rw-r--r-- 2767 software.cfg