Merge branch 'dp/merge-strategy-doc-fix'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: e2a37ec2b03456bc9131f7c1fe68e1742bf28953)
-rw-r--r-- 6928 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