Merge branch 'jc/maint-combined-diff-work-tree'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 660578d4da9d71fbc1e553c95d18987b40af5f0f)
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf