Merge remote-tracking branch 'refs/remotes/origin/master'
[kivitendo-erp.git] / config /
drwxr-xr-x   ..
-rw-r--r-- 49 .gitignore
-rw-r--r-- 31 .htaccess
-rw-r--r-- 11689 kivitendo.conf.default