diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-20 10:45:43 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-20 10:45:43 -0600 |
| commit | 071c2c9c853b7d91127a7c44ec3c71830e0dcb20 (patch) | |
| tree | 406918f6083b54b4d084dd1a20c921fecc32dc64 /app/views/user_mailer/email_changed.en.text.erb | |
| parent | 2ca965c704075467226dbf798e13ac8e0e62cc15 (diff) | |
| parent | 0b7a0d15c7e7e23ca0c8bdb738b4a4911bf42eb2 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'app/views/user_mailer/email_changed.en.text.erb')
| -rw-r--r-- | app/views/user_mailer/email_changed.en.text.erb | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/app/views/user_mailer/email_changed.en.text.erb b/app/views/user_mailer/email_changed.en.text.erb deleted file mode 100644 index 971972461..000000000 --- a/app/views/user_mailer/email_changed.en.text.erb +++ /dev/null @@ -1,13 +0,0 @@ -Hello <%= @resource.email %>! - -<% if @resource&.unconfirmed_email? %> -We're contacting you to notify you that the email you use on <%= @instance %> is being changed to <%= @resource.unconfirmed_email %>. -<% else %> -We're contacting you to notify you that the email you use on <%= @instance %> has been changed to <%= @resource.email %>. -<% end %> - -If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the instance admin if you're locked out of your account. - -Sincerely, - -The <%= @instance %> team |