diff options
author | ThibG <thib@sitedethib.com> | 2019-03-28 15:12:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-28 15:12:33 +0100 |
commit | bb316faffff7a76bc89f7e942233f0e14caf60f5 (patch) | |
tree | 260458c7ff43dd82fc02cc7e5ef0920dd8d2a25b /config/locales/activerecord.pl.yml | |
parent | 0418bdd71f59b4d7e9f3498f2990c8b044f310e1 (diff) | |
parent | 050efbc12650feaac3e833c4dd740bf090e3dae1 (diff) |
Merge pull request #970 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 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/locales/activerecord.pl.yml b/config/locales/activerecord.pl.yml index d0c86a11e..bd8e40a6a 100644 --- a/config/locales/activerecord.pl.yml +++ b/config/locales/activerecord.pl.yml @@ -2,8 +2,6 @@ pl: activerecord: attributes: - status: - owned_poll: Ankiety user: email: adres e-mail errors: |