diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-01-04 11:23:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-04 11:23:45 -0800 |
| commit | f2665ec9fa42b75d92d0301cff85362836c5729a (patch) | |
| tree | 5f72e3c95b320fa6eb3d9afcec642e3c7dcd1b9a /gitweb | |
| parent | 081f84ee9edb1775e5a5495375a93b3bc6727742 (diff) | |
| parent | 9d9f5e72dc5959750498acc81b3e2c8ca76ad499 (diff) | |
| download | git-f2665ec9fa42b75d92d0301cff85362836c5729a.tar.gz git-f2665ec9fa42b75d92d0301cff85362836c5729a.tar.xz | |
Merge branch 'maint'
* maint:
gitweb: skip logo in atom feed when there is none
t9001: Fix test prerequisites
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 47796180d..c65af1a00 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -7169,7 +7169,7 @@ XML if (defined $favicon) { print "<icon>" . esc_url($favicon) . "</icon>\n"; } - if (defined $logo_url) { + if (defined $logo) { # not twice as wide as tall: 72 x 27 pixels print "<logo>" . esc_url($logo) . "</logo>\n"; } |