about summary refs log tree commit diff
path: root/config/locales/devise.ja.yml
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-05-27 17:58:44 +0200
committerClaire <claire.github-309c@sitedethib.com>2021-05-27 17:58:44 +0200
commit10a31a934fb62a95d6144794b9c449f1092593f0 (patch)
tree193863c7b8bbd25c77ea6489134db3cb9397ed3f /config/locales/devise.ja.yml
parent2024aef0f9b52297d814811f5825678a563f78ff (diff)
parent2efe711a517642cd7032aee318c85f6c158ee0ca (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream's README got updated, but we have a completely different one.
  Kept ours.
Diffstat (limited to 'config/locales/devise.ja.yml')
0 files changed, 0 insertions, 0 deletions