diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-16 21:52:38 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-16 21:52:38 +0200 |
commit | 78ac246b877072bb5f94da34d29612fafde3a8ae (patch) | |
tree | e1b781fe4fae9d02284e5e836338cc598431413f /config/locales/doorkeeper.ca.yml | |
parent | 80aad16e1035a72fec1af56aaac458a35e1f02c5 (diff) | |
parent | 6bed372ad2d8da87f0f3cfa478e688c48aa94702 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn
Diffstat (limited to 'config/locales/doorkeeper.ca.yml')
-rw-r--r-- | config/locales/doorkeeper.ca.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml index c1748d05b..56686e3e5 100644 --- a/config/locales/doorkeeper.ca.yml +++ b/config/locales/doorkeeper.ca.yml @@ -115,5 +115,6 @@ ca: title: OAuth autorització requerida scopes: follow: seguir, blocar, desblocar i deixar de seguir comptes + push: rebre notificacions push del teu compte read: llegir les dades del teu compte write: publicar en el teu nom |