Merge branch 'fc/rerere-conflict-style'
[gitweb.git] / gitweb / static /
drwxr-xr-x   parent (dest: gitweb; base: 6d3c4e93d40c3a7fce3c8bdc933feeb74a6b2b08)
-rw-r--r-- 115 git-favicon.png
-rw-r--r-- 207 git-logo.png
-rw-r--r-- 10637 gitweb.css
drwxr-xr-x - js