Merge branch 'rt/cherry-revert-conflict-summary'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: f5b121aef305398a3e462b28240c0d6d754315c1)
-rw-r--r-- 2708 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf