A conflict by merging

This commit is contained in:
Karel Picman 2013-09-25 13:24:18 +02:00
parent e58f91fbd7
commit 471360d738

View File

@ -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