Merge branch 'jc/conflict-marker-size'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 06dbc1ea5768618337bf11e5f64c4f9f14a68008)
-rw-r--r-- 1529 apache.conf
-rw-r--r-- 227 ssl.cnf