Merge branch 'fc/rerere-conflict-style' into maint
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: ada8710e634b4f9f686bd0477bd92b272ec60801)
-rw-r--r-- 4530 apache.conf
-rwxr-xr-x 349 broken-smart-http.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf