]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 974926b 7f52519)
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Mon, 21 Apr 2008 18:06:31 +0000 (20:06 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Mon, 21 Apr 2008 18:06:31 +0000 (20:06 +0200)
Conflicts:

templates/html/head.tmpl

1  2 
templates/html/download.tmpl patch | diff1 | diff2 | blob | history

diff --cc templates/html/download.tmpl
Simple merge