diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
commit | 659b8a12ece7110608ee84748e57647c08d1dbda (patch) | |
tree | 1d8350cdad20ad1eb8c67a4d17a18ff7183f22e5 /config/locales/doorkeeper.eo.yml | |
parent | c2e528916cae422baee3d72a3b4409a23c476b3f (diff) | |
parent | 63c7b9157274f57c496399a1a5c728b32415034c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes
Diffstat (limited to 'config/locales/doorkeeper.eo.yml')
-rw-r--r-- | config/locales/doorkeeper.eo.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/doorkeeper.eo.yml b/config/locales/doorkeeper.eo.yml index 59df52852..9713c462c 100644 --- a/config/locales/doorkeeper.eo.yml +++ b/config/locales/doorkeeper.eo.yml @@ -115,5 +115,6 @@ eo: title: OAuth-a rajtigo bezonata scopes: follow: sekvi, bloki, malbloki kaj malsekvi kontojn + push: ricevi puŝ-sciigojn por via konto read: legi la datumojn de via konto write: mesaĝi kiel vi |