diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-09-18 17:25:56 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-09-18 17:25:56 +0200 |
commit | 5cadb4723832b91068ee51955b9d4b1336502369 (patch) | |
tree | 2e915e53ee0d25ea63ee3910ae8ced44f3295e21 /config/locales/activerecord.pt.yml | |
parent | ab646fac5f582fe9bef22d8b9a4995fbb4b42d7d (diff) | |
parent | d0c2c5278391b82ba7fa2f230bf237805ff61a0c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code
Diffstat (limited to 'config/locales/activerecord.pt.yml')
-rw-r--r-- | config/locales/activerecord.pt.yml | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/config/locales/activerecord.pt.yml b/config/locales/activerecord.pt.yml deleted file mode 100644 index 556fcfc4f..000000000 --- a/config/locales/activerecord.pt.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -pt: - activerecord: - errors: - models: - account: - attributes: - username: - invalid: apenas letras, números e underscores - status: - attributes: - reblog: - taken: do status já existe |