Merge branch 'jc/merge-symlink-ours-theirs' into maint
[gitweb.git] / gitweb / static /
drwxr-xr-x   parent (dest: gitweb; base: ff19620f8127798dcfc1dab7c633eb7505b7abd3)
-rw-r--r-- 115 git-favicon.png
-rw-r--r-- 207 git-logo.png
-rw-r--r-- 10637 gitweb.css
drwxr-xr-x - js