Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: ff65e796f00097c118a85ac40e51405080e98627)
-rw-r--r-- 4972 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