Merge branch 'jk/add-p-skip-conflicts'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 3c524002d67471f8ef5455ef0e5ce3e6fc846b32)
-rw-r--r-- 2708 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf