Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 85785df6d6db50ff37d0ff1878c16ad69a063f6a)
-rw-r--r-- 4530 apache.conf
-rwxr-xr-x 349 broken-smart-http.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf