Merge branch 'ap/maint-merge-strategy-list-fix'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 22c4e72d6eef8295a3311f6eb2f82a5494f8b88e)
-rw-r--r-- 1358 apache.conf
-rw-r--r-- 227 ssl.cnf