about summary refs log tree commit diff
path: root/config/locales/devise.zh-CN.yml
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-03-27 21:54:44 +0100
committerThibaut Girka <thib@sitedethib.com>2020-03-27 21:54:44 +0100
commit7b435fd9bf81265241fab792d8e8e0c2f4f1b619 (patch)
treeef366f436ed5180489cc9377268e10328fe9a932 /config/locales/devise.zh-CN.yml
parent02f1c04fabab221130de8dfb5611be81825b193b (diff)
parent6c79b7237e31eb510af7df3f4f2cb133dea39845 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly.
Diffstat (limited to 'config/locales/devise.zh-CN.yml')
0 files changed, 0 insertions, 0 deletions