Merge branch 'jk/merge-tree-added-identically'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: e7e656c09ab6bb0eda6312045cb5d61448309bcb)
-rw-r--r-- 3238 apache.conf
-rwxr-xr-x 349 broken-smart-http.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf