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/reset_password_instructions.no.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/reset_password_instructions.no.text.erb')
-rw-r--r-- | app/views/user_mailer/reset_password_instructions.no.text.erb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/views/user_mailer/reset_password_instructions.no.text.erb b/app/views/user_mailer/reset_password_instructions.no.text.erb deleted file mode 100644 index 387dc7c3e..000000000 --- a/app/views/user_mailer/reset_password_instructions.no.text.erb +++ /dev/null @@ -1,9 +0,0 @@ - -Hei <%= @resource.email %>! - -Noen har forespurt en lenke til å bytte passord på din Mastodon-bruker. Du kan gjøre det ved å følge lenken under. - -<%= edit_password_url(@resource, reset_password_token: @token) %> - -Hvis du ikke vil endre ditt passord kan du ignorere denne epost. -Passordet ditt blir ikke endret før du følger lenken over og endrer det. |