Merge branch 'sh/pull-rebase-preserve'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 6026f68652b6f220ce12c161fe8ac3e44a1b5b5a)
-rw-r--r-- 4392 apache.conf
-rwxr-xr-x 349 broken-smart-http.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf