From 471360d7386710425b01321bbda9682fabdfa935 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Wed, 25 Sep 2013 13:24:18 +0200 Subject: [PATCH] A conflict by merging --- app/controllers/dmsf_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb index 9e940e5a..45172c6f 100644 --- a/app/controllers/dmsf_controller.rb +++ b/app/controllers/dmsf_controller.rb @@ -75,7 +75,7 @@ class DmsfController < ApplicationController DmsfMailer.send_documents(User.current, @email_params["to"], @email_params["cc"], @email_params["subject"], @email_params["zipped_content"], @email_params["body"]).deliver File.delete(@email_params["zipped_content"]) - flash[:notice] = l(:notice_email_sent, @email_params['to']) + flash[:notice] = l(:notice_email_sent, @email_params["to"]) redirect_to({:controller => "dmsf", :action => "show", :id => @project, :folder_id => @folder}) end