diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-10-03 11:10:12 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-10-03 11:10:12 +0200 |
| commit | a84aedb7a7f050cbf5293351723f55a904992b3a (patch) | |
| tree | 769d397390665bcddf9b44fc1ad4418b2757c5f1 /config/locales/activerecord.id.yml | |
| parent | 857c67f31b23b9c496e07eda41755ba449a37f17 (diff) | |
| parent | bae268b2f6501ccb0ceeb8dd36180698839c4d3c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.
Diffstat (limited to 'config/locales/activerecord.id.yml')
| -rw-r--r-- | config/locales/activerecord.id.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/activerecord.id.yml b/config/locales/activerecord.id.yml index 9fa093e9d..673d002e3 100644 --- a/config/locales/activerecord.id.yml +++ b/config/locales/activerecord.id.yml @@ -1,6 +1,10 @@ --- id: activerecord: + attributes: + poll: + expires_at: Tenggat waktu + options: Pilihan errors: models: account: |