]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2df82b1 5e94efa)
Merge branch 'master' into debian-master
authorSimon Paillard <spaillard@debian.org>
Wed, 17 Aug 2011 19:39:45 +0000 (21:39 +0200)
committerSimon Paillard <spaillard@debian.org>
Wed, 17 Aug 2011 19:39:45 +0000 (21:39 +0200)
1  2 
static/about/index.tmpl patch | diff1 | diff2 | blob | history

diff --cc static/about/index.tmpl
Simple merge