diff options
author | ThibG <thib@sitedethib.com> | 2020-01-13 16:07:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-13 16:07:40 +0100 |
commit | ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (patch) | |
tree | 14bcdbeac5f8d904cad3d13a469869c5baf9db99 /config/locales/activerecord.no.yml | |
parent | 180f1383943ad171d8394ef9af7c7861bfc08056 (diff) | |
parent | 83f8bf48d91605fa63325b4d4acec717031da025 (diff) |
Merge pull request #1263 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/activerecord.no.yml')
-rw-r--r-- | config/locales/activerecord.no.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/activerecord.no.yml b/config/locales/activerecord.no.yml index 3676b953c..553bd65bf 100644 --- a/config/locales/activerecord.no.yml +++ b/config/locales/activerecord.no.yml @@ -1,6 +1,10 @@ --- 'no': activerecord: + attributes: + poll: + expires_at: Tidsfrist + options: Valg errors: models: account: |