Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: e7cc0ede1837b6f679e245e29ae3687fc5e6c20d)
-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