Merge branch 'se/doc-checkout-ours-theirs' into maint
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 204ea3cad443df4f14623a09ee8201a552f067af)
-rw-r--r-- 4661 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