Merge branch 'nd/remote-plural-ours-plus-theirs'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6)
-rw-r--r-- 5210 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