Merge branch 'jk/two-way-merge-corner-case-fix' into maint
[gitweb.git] / gitweb / static /
drwxr-xr-x   parent (dest: gitweb; base: 4766036ecdee2d45b5a955409da5e6751c3e2f05)
-rw-r--r-- 115 git-favicon.png
-rw-r--r-- 207 git-logo.png
-rw-r--r-- 10586 gitweb.css
drwxr-xr-x - js