diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
| commit | 4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch) | |
| tree | 75f4c36771caf222280249cd1ed611d5ade8bd48 /mercurial/templates/paper/shortlog.tmpl | |
| parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
| parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
| download | mercurial-tarball-baserock/morph.tar.gz | |
Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph
This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.
We also undo the setup.py change because python now supports bz2
Diffstat (limited to 'mercurial/templates/paper/shortlog.tmpl')
| -rw-r--r-- | mercurial/templates/paper/shortlog.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mercurial/templates/paper/shortlog.tmpl b/mercurial/templates/paper/shortlog.tmpl index b69d4b0..a2694b5 100644 --- a/mercurial/templates/paper/shortlog.tmpl +++ b/mercurial/templates/paper/shortlog.tmpl @@ -11,7 +11,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li class="active">log</li> |