Merge branch 'jc/merge-x-theirs-docfix'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 4da3e234f5a3989328c4dc8368cf5906f8679b30)
-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