Merge branch 'se/doc-checkout-ours-theirs'
[gitweb.git] / gitweb / static /
drwxr-xr-x   parent (dest: gitweb; base: c0b901eaf71ca700eb6c8711af0c848df2d011c5)
-rw-r--r-- 115 git-favicon.png
-rw-r--r-- 207 git-logo.png
-rw-r--r-- 10637 gitweb.css
drwxr-xr-x - js