Merge branch 'jk/error-resolve-conflict-advice'
[gitweb.git] / gitweb / static /
drwxr-xr-x   parent (dest: gitweb; base: d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7)
-rw-r--r-- 115 git-favicon.png
-rw-r--r-- 207 git-logo.png
-rw-r--r-- 10637 gitweb.css
drwxr-xr-x - js