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