Merge branch 'jc/deprecate-old-syntax-from-merge'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 36a83f375bc247a09f46de0445a138d5e6de8a4f)
-rw-r--r-- 1358 apache.conf
-rw-r--r-- 227 ssl.cnf