From 3a164c47cd4f58ff8ee59446c73970d1b9b3fbbf Mon Sep 17 00:00:00 2001
From: Neil Smith <neil.git@njae.me.uk>
Date: Wed, 22 Jul 2009 13:37:05 +0000
Subject: [PATCH] Merged updates from trunk into stable branch

---
 app/views/feed/index.html.erb |   2 +-
 public/favicon.ico            | Bin 0 -> 318 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/feed/index.html.erb b/app/views/feed/index.html.erb
index d72a9be..1a6534b 100644
--- a/app/views/feed/index.html.erb
+++ b/app/views/feed/index.html.erb
@@ -9,6 +9,6 @@
 
 <ul>
 <% for feed in @feeds %>
-  <li><%= link_to(h(feed.feed_name), (feed_url(:feed_name => feed.feed_name))) %></li>
+  <li><%= link_to( h(feed.feed_name), (feed_url(:feed_name => feed.feed_name))) %></li>
 <% end %>
 </ul>
\ No newline at end of file
diff --git a/public/favicon.ico b/public/favicon.ico
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ced5ec16f4c32c90b849d5dbaf34941d2aed9b2d 100644
GIT binary patch
literal 318
zcmZ{fv26lD6ht2a+d>XF$%52`gt&)IAaFzhjyNIcfP|0&>;Py1(ZB^q15g101)$Fb
z1Vr~ei$n&0^>#F~qg^djw2~yzUZYci7SIuiXp5LXo029AQvR4QWT~379>6k%^cRK;
zMI(om@VfXBb5Y)|biahsHJ1>+?R?X|S+t>NcD}1@P;TMtLp`%DR5wyx^13%WN#C>G
xAuC{<Y2>GpTt2Gnb>+Exp`NUQmuRm!9N$D0X8L>N(ad5P&(+(;egle6_y^hxWrhF%

literal 0
HcmV?d00001

-- 
2.34.1