diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-11 18:12:42 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-11 18:12:42 +0200 |
| commit | 45fce0e496727cd1579c630c22592638341f78c6 (patch) | |
| tree | ff72ae5b3482e4df7885e1e5a38c982529fd11c4 /config/locales/activerecord.nl.yml | |
| parent | 34142ab29c33104793afe3199f102d84b83b9b57 (diff) | |
| parent | 352bae8c3ef2aca41de4aacb85d5e036a1d2bace (diff) | |
Merge branch 'master' into glitch-soc/merge
Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml
Diffstat (limited to 'config/locales/activerecord.nl.yml')
| -rw-r--r-- | config/locales/activerecord.nl.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/activerecord.nl.yml b/config/locales/activerecord.nl.yml index 797209665..eeabab34a 100644 --- a/config/locales/activerecord.nl.yml +++ b/config/locales/activerecord.nl.yml @@ -6,7 +6,7 @@ nl: account: attributes: username: - invalid: alleen letters, nummers en laag streepje + invalid: alleen letters, nummers en underscores status: attributes: reblog: |