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