Merge branch 'jc/fix-diff-files-unmerged' into maint
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: a613b534bca2d56f2ad67b3a7f0cf2b34f031260)
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf