Merge branch 'nm/grep-object-sha1-lock' into maint
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 7c4f050ae1e140a81f66b5cf92ad2c8673cfda8b)
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf