Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 216d29ef257e48f95bc14765d5da17e7854a3109)
-rw-r--r-- 4604 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