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.ca.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.ca.html.erb')
-rw-r--r-- | app/views/user_mailer/reset_password_instructions.ca.html.erb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/views/user_mailer/reset_password_instructions.ca.html.erb b/app/views/user_mailer/reset_password_instructions.ca.html.erb deleted file mode 100644 index 6f76c441d..000000000 --- a/app/views/user_mailer/reset_password_instructions.ca.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -<p>Hola <%= @resource.email %>!</p> - -<p>Algú ha sol·licitat un enllaç per canviar la contrasenya a mastodont.cat. Això es pot fer a través del següent enllaç.</p> - -<p><%= link_to 'Canviar la contrasenya', edit_password_url(@resource, reset_password_token: @token) %></p> - -<p>Si no has sol·licitat aquest canvi, si us plau, ignora aquest correu.</p> -<p>La teva contrasenya no canviarà fins que accedeix a l'enllaç de dalt per crear-ne una de nova.</p> |