From: Neil Smith Date: Wed, 22 Jul 2009 13:37:05 +0000 (+0000) Subject: Merged updates from trunk into stable branch X-Git-Url: https://git.njae.me.uk/?a=commitdiff_plain;h=3a164c47cd4f58ff8ee59446c73970d1b9b3fbbf;p=feedcatcher.git Merged updates from trunk into stable branch --- 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 @@ \ No newline at end of file diff --git a/public/favicon.ico b/public/favicon.ico index e69de29..ced5ec1 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ