diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
| commit | e855df149bd2f19729af48cd5f452fa3972273f8 (patch) | |
| tree | 4d9dab4fd4568f67b07642db61a2f382e8b1dcc0 /config/locales/activerecord.fi.yml | |
| parent | c647fa99cab9b9db81d36223cf2c2c27e065b648 (diff) | |
| parent | 5ba46952af87e42a64962a34f7ec43bc710bdcaf (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.
Diffstat (limited to 'config/locales/activerecord.fi.yml')
| -rw-r--r-- | config/locales/activerecord.fi.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/activerecord.fi.yml b/config/locales/activerecord.fi.yml index efd8b5e75..40dd81812 100644 --- a/config/locales/activerecord.fi.yml +++ b/config/locales/activerecord.fi.yml @@ -4,7 +4,7 @@ fi: attributes: poll: expires_at: Määräaika - options: Vaihtoehdot + options: Valinnat user: agreement: Palvelusopimus email: Sähköpostiosoite |