Merge remote-tracking branch 'origin/master' into slapos-testing
[slapos.git] / software / drupal /
drwxr-xr-x   ..
-rw-r--r-- 21409 settings.php.in
-rw-r--r-- 566 software.cfg