Merge branch 'nm/maint-conflicted-submodule-entries'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 1eb71bc0ec609c67b8a308f9267691144a48bffd)
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf