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.oc.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.oc.yml')
-rw-r--r-- | config/locales/doorkeeper.oc.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/doorkeeper.oc.yml b/config/locales/doorkeeper.oc.yml index d83d07438..46060e49f 100644 --- a/config/locales/doorkeeper.oc.yml +++ b/config/locales/doorkeeper.oc.yml @@ -115,5 +115,6 @@ oc: title: Cal una autorizacion OAuth scopes: follow: sègre, blocar, quitar de blocar e quitar de sègre de comptes + push: recebre las notificacions push per vòstre compte read: legir las donadas de vòstre compte write: publicar per vos |