Merge remote-tracking branch 'origin/master' into slapos-testing
[slapos.git] / software / openX /
drwxr-xr-x   ..
-rw-r--r-- 545 instance.cfg
-rw-r--r-- 2729 software.cfg