]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jn/mime-type-with-params'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2011 16:45:41 +0000 (09:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2011 16:45:41 +0000 (09:45 -0700)
* jn/mime-type-with-params:
  gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
  gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss

1  2 
gitweb/gitweb.perl

Simple merge