diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-21 00:53:28 +0200 |
|---|---|---|
| committer | Holly 'Frinkel' Lotor <admin@frinkel.tech> | 2020-01-20 16:55:55 -0500 |
| commit | b0630ddc8261250c5edbf2907648695041649e98 (patch) | |
| tree | 9ca374e4e98598efced200e4a993875245ab93b6 /config/locales/activerecord.cy.yml | |
| parent | 9447566b8ed8e532c13dd97ecd53681029fdcec0 (diff) | |
Original upstream merge
Diffstat (limited to 'config/locales/activerecord.cy.yml')
| -rw-r--r-- | config/locales/activerecord.cy.yml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/locales/activerecord.cy.yml b/config/locales/activerecord.cy.yml index 265530124..248e93ad5 100644 --- a/config/locales/activerecord.cy.yml +++ b/config/locales/activerecord.cy.yml @@ -1,6 +1,13 @@ --- cy: activerecord: +<<<<<<< HEAD +======= + attributes: + poll: + expires_at: Terfyn amser + options: Dewisiadau +>>>>>>> f1597e1ab... Merge pull request #1158 from ThibG/glitch-soc/merge-upstream errors: models: account: |