Merge branch 'master' into develop

This commit is contained in:
Sojan 2021-03-07 20:44:31 +05:30
commit d5c6e8e8c8

View file

@ -1,7 +1,7 @@
class ApplicationMailer < ActionMailer::Base
include ActionView::Helpers::SanitizeHelper
default from: ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')
default from: ENV.fetch('MAILER_SENDER_EMAIL', 'Chatwoot <accounts@chatwoot.com>')
before_action { ensure_current_account(params.try(:[], :account)) }
around_action :switch_locale
layout 'mailer/base'