Merge branch 'tg/conflict-marker-size'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 4dd0c4a44cf9500f3197062da1a82a83a867fb94)
-rw-r--r-- 7160 apache.conf
-rw-r--r-- 657 apply-one-time-sed.sh
-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