From: Neil Smith Date: Mon, 27 Jul 2009 13:24:29 +0000 (+0000) Subject: Merging changes from trunk into stable branch X-Git-Url: https://git.njae.me.uk/?a=commitdiff_plain;h=97a0772b06264134cfe38e7494f9427efe0840a0;p=feedcatcher.git Merging changes from trunk into stable branch --- diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1599adb..1f8b1b4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,7 +5,7 @@ <% if flash[:notice] -%> -

<%= flash[:notice] %>

<%= h flash[:notice] %>

<% end -%> <%= yield :layout %>