Merge branch 'da/mergetool-docs'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 39ca1bd88256ea482305b7e0acc943ef14e4b36d)
-rw-r--r-- 2991 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf