Merge branch 'jk/add-p-skip-conflicts' into maint
[gitweb.git] / gitweb / static /
drwxr-xr-x   parent (dest: gitweb; base: 4579a0547cc558bd0e341adb77897e1f2f331f78)
-rw-r--r-- 115 git-favicon.png
-rw-r--r-- 207 git-logo.png
-rw-r--r-- 10464 gitweb.css
drwxr-xr-x - js