Merge branch 'rs/git-gui-use-modern-git-merge-syntax'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 5a2c86fb08cc195ca39d82e2c2d84158f05b96fc)
-rw-r--r-- 5713 apache.conf
-rw-r--r-- 339 broken-smart-http.sh
-rwxr-xr-x 513 error.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf