Merge branch 'pw/p4-submit-conflicts'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 8db3865936550fe239b11a44ed52230c3c3eb223)
-rw-r--r-- 2844 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf