Merged updates from trunk into stable branch

diff --git a/app/views/feed/index.html.erb b/app/views/feed/index.html.erb
index d72a9bee5f48e95577f94373b2b541a5b587fa5b..1a6534bccacfe37d3203d18d5b7e1c48e3c35a88 100644 (file)
--- 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 (file)
Binary files a/public/favicon.ico and b/public/favicon.ico differ