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.html.haml | |
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.html.haml')
-rw-r--r-- | app/views/user_mailer/reset_password_instructions.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/user_mailer/reset_password_instructions.html.haml b/app/views/user_mailer/reset_password_instructions.html.haml index c0e6775d4..5d9ce6a75 100644 --- a/app/views/user_mailer/reset_password_instructions.html.haml +++ b/app/views/user_mailer/reset_password_instructions.html.haml @@ -17,7 +17,7 @@ %tbody %tr %td - = image_tag full_pack_url('icon_lock_open.svg'), alt: '' + = image_tag full_pack_url('icon_lock_open.png'), alt: '' %h1= t 'devise.mailer.reset_password_instructions.title' %p.lead= t 'devise.mailer.reset_password_instructions.explanation' |