diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
| commit | 89a9d629f776a3a115c1e89ee4c13e8cbe7ae684 (patch) | |
| tree | c5da0f86e23fbd544dea6bcef124c41803c841ef /app/views/user_mailer/reset_password_instructions.no.html.erb | |
| parent | 0c7dc6c78123728a9a0a32e16c2ad524e76926c8 (diff) | |
| parent | 5276c0a0900a0886b59a8ead2346540aa381ea46 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: Gemfile.lock
Diffstat (limited to 'app/views/user_mailer/reset_password_instructions.no.html.erb')
| -rw-r--r-- | app/views/user_mailer/reset_password_instructions.no.html.erb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/views/user_mailer/reset_password_instructions.no.html.erb b/app/views/user_mailer/reset_password_instructions.no.html.erb deleted file mode 100644 index 398e95e4e..000000000 --- a/app/views/user_mailer/reset_password_instructions.no.html.erb +++ /dev/null @@ -1,9 +0,0 @@ - -<p>Hei <%= @resource.email %>!</p> - -<p>Noen har forespurt en lenke til å bytte passord på din Mastodon-bruker. Du kan gjøre det ved å følge lenken under.</p> - -<p><%= link_to 'Endre mitt passord', edit_password_url(@resource, reset_password_token: @token) %></p> - -<p>Hvis du ikke vil endre ditt passord kan du ignorere denne epost.</p> -<p>Passordet ditt blir ikke endret før du følger lenken over og endrer det.</p> |