Merge branch 'dp/merge-strategy-doc-fix'
[gitweb.git] / gitweb / static /
drwxr-xr-x   parent (dest: gitweb; base: e2a37ec2b03456bc9131f7c1fe68e1742bf28953)
-rw-r--r-- 115 git-favicon.png
-rw-r--r-- 207 git-logo.png
-rw-r--r-- 10637 gitweb.css
drwxr-xr-x - js