Merge branch 'jk/error-resolve-conflict-advice'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7)
-rw-r--r-- 4604 apache.conf
-rw-r--r-- 339 broken-smart-http.sh
-rwxr-xr-x 416 error.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf