Merge branch 'da/mergetool-delete-delete-conflict'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: e094194f08c3d7f3d9ea1714d34ee20ba82f6851)
-rw-r--r-- 4944 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