about summary refs log tree commit diff
path: root/config/locales/devise.zh-CN.yml
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-05-04 09:42:31 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-05-04 09:42:31 -0500
commit77a92d3260bdfeeb5ef14f53ced3a9d480053e0f (patch)
tree950597d12b7433407fb1c7e9fa4947acc53d9d69 /config/locales/devise.zh-CN.yml
parentc511b0f72ab6952e0ce89eb0c601fcb98eedd200 (diff)
parent251bbf9728a310353c3957a0ad51a7f641aa0a9e (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
  Conflicts:
 	Gemfile.lock
Diffstat (limited to 'config/locales/devise.zh-CN.yml')
0 files changed, 0 insertions, 0 deletions