diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-02-09 12:15:55 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-02-09 12:15:55 +0100 |
commit | dae5e446fe7294dba0e14311ef3da4dc8fff6a3a (patch) | |
tree | 33a76386b1e8bc9c968bfc49409f72000b7ec410 /config/locales/doorkeeper.ast.yml | |
parent | a2cfe3daaadabfaad71969a44c460bd76b8405ff (diff) | |
parent | 57c42c20c01b46f0d7cad5a357d56190274a3fa1 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.
Diffstat (limited to 'config/locales/doorkeeper.ast.yml')
-rw-r--r-- | config/locales/doorkeeper.ast.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/doorkeeper.ast.yml b/config/locales/doorkeeper.ast.yml index af9dee300..b9ab81618 100644 --- a/config/locales/doorkeeper.ast.yml +++ b/config/locales/doorkeeper.ast.yml @@ -77,7 +77,7 @@ ast: scopes: admin:read: lleer tolos datos del sirvidor admin:read:accounts: lleer la información sensible de toles cuentes - admin:read:reports: lleer la información sensible de tolos informe y cuentes informaes + admin:read:reports: lleer la información sensible de tolos informes y cuentes informaes admin:write: modificar tolos datos del sirvidor read: lleer tolos datos de la to cuenta read:accounts: ver información de cuentes |