Merge branch 'jk/rebase-i-submodule-conflict-only'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 1f643446598c3727b506a46d88f734b13e90dc77)
-rw-r--r-- 2708 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf