Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
[gitweb.git] / gitweb / static /
drwxr-xr-x   parent (dest: gitweb; base: 216d29ef257e48f95bc14765d5da17e7854a3109)
-rw-r--r-- 115 git-favicon.png
-rw-r--r-- 207 git-logo.png
-rw-r--r-- 10637 gitweb.css
drwxr-xr-x - js