diff options
author | ThibG <thib@sitedethib.com> | 2019-06-13 23:53:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-13 23:53:21 +0200 |
commit | c0e5f32d13dfd696728dc1fa2ad9a93a27aa405f (patch) | |
tree | cf6ad8df684977b10ffd0d4a313d6dccb42ac15a /config/locales/activerecord.pl.yml | |
parent | 80849812d2a03ff9da671a2204bacf0c85f6ab0d (diff) | |
parent | 0fd7a8b63d6247ff1fe1d305ec712c0a519a52f1 (diff) |
Merge pull request #1111 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/activerecord.pl.yml')
-rw-r--r-- | config/locales/activerecord.pl.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/locales/activerecord.pl.yml b/config/locales/activerecord.pl.yml index bd8e40a6a..f10420ec7 100644 --- a/config/locales/activerecord.pl.yml +++ b/config/locales/activerecord.pl.yml @@ -2,8 +2,9 @@ pl: activerecord: attributes: - user: - email: adres e-mail + poll: + expires_at: Ostateczny termin + options: Opcje errors: models: account: |