Merge branch 'rt/doc-merge-file-diff3'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 482bd22d4985d605e7778c0e9ee21c65891f2b55)
-rw-r--r-- 4154 apache.conf
-rwxr-xr-x 349 broken-smart-http.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf