Merge remote-tracking branch 'origin/new/bug_6894'
[koha.git] / etc /
drwxr-xr-x   ..
-rw-r--r-- 623 README.txt
-rw-r--r-- 11728 koha-conf.xml
-rw-r--r-- 6525 koha-httpd.conf
drwxr-xr-x - pazpar2
drwxr-xr-x - zebradb