Merge branch 'nd/list-merge-strategy' into next
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: a75d04a67532d21f43261716b4671b7095fa7535)
-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