Merge branch 'jc/merge-x-theirs-docfix' into maint
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 77cdf8c6f9d142a8d9693531d442ffa0712874d6)
-rw-r--r-- 6793 apache.conf
-rw-r--r-- 339 broken-smart-http.sh
-rwxr-xr-x 513 error.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf