Download as
Browse Code »

Commit d65a2fb42af79ae253c1a26ce55837c9357bbbc4

Authored by Evandro Jr
2 parents 9dfdd02b b12ffc48
Exists in staging and in 7 other branches angular_poc, api-article-archived, api-homepage, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email

Merge branch 'email_template' into production

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/views/email_templates/edit.html.erb
  Diff comments   View file @d65a2fb
1 -<h1>_('Editing Email Template')</h1> 1 +<h1><%= _('Editing Email Template') %></h1>
2 2
3 <%= render 'form' %> 3 <%= render 'form' %>
app/views/email_templates/new.html.erb
  Diff comments   View file @d65a2fb
1 -<h1>_('New Email Template')</h1> 1 +<h1><%= _('New Email Template') %></h1>
2 2
3 <%= render 'form' %> 3 <%= render 'form' %>