Merge branch 'mr/gitweb-jsmin'

diff --git a/.gitignore b/.gitignore
index 7b3acb766491e2e002f293cf9dd50298d0d7d83a..4c2415276fe88677b9b33f9e40b30d3a43f89a33 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -156,6 +156,7 @@
 /git-core-*/?*
 /gitk-git/gitk-wish
 /gitweb/gitweb.cgi
+/gitweb/gitweb.min.*
 /test-chmtime
 /test-ctype
 /test-date