Merge branch 'mg/mailmap-update'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 59d1e01d69865cb2238e01102c6987e4e1d71a32)
-rw-r--r-- 1529 apache.conf
-rw-r--r-- 227 ssl.cnf