diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-28 21:48:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-28 21:48:28 -0400 |
commit | c027a7bd4d7b5af21f4b201d656f7251fa3606a1 (patch) | |
tree | ce2c2327b26358c26cb899ea918988af373ca6d6 /app/views/user_mailer/reset_password_instructions.zh-cn.text.erb | |
parent | 210e6776fce016666ecfd248b2208c487f3440f9 (diff) | |
parent | 53f829dfa8bc376041a442dc84c22aa1cbfcb9d0 (diff) |
Merge pull request #157 from glitch-soc/merging-upstream
ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!
Diffstat (limited to 'app/views/user_mailer/reset_password_instructions.zh-cn.text.erb')
-rw-r--r-- | app/views/user_mailer/reset_password_instructions.zh-cn.text.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb b/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb index 574a0bb2e..7df590f78 100644 --- a/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb +++ b/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb @@ -1,6 +1,6 @@ <%= @resource.email %> ,嗨呀!! -有人(但愿是你)请求更改你Mastodon账户的密码。如果是你的话,请点击下面的链接: +有人(但愿是你)请求更改你Mastodon帐户的密码。如果是你的话,请点击下面的链接: <%= link_to '更改密码', edit_password_url(@resource, reset_password_token: @token) %> |