]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62b2941 9f59a97)
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Fri, 6 Jun 2008 23:51:15 +0000 (01:51 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Fri, 6 Jun 2008 23:51:15 +0000 (01:51 +0200)
1  2 
conf/apache.conf.sed.in patch | diff1 | diff2 | blob | history
templates/html/head.tmpl patch | diff1 | diff2 | blob | history

diff --cc conf/apache.conf.sed.in
Simple merge
diff --cc templates/html/head.tmpl
Simple merge