diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-04-03 19:17:20 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-04-03 19:17:20 +0000 |
commit | 6611100480c86c07972c1223e7231c136966e11d (patch) | |
tree | d6ce7cf9568d13ba0dfc8ee32fd1335e0d053f43 /config/locales/fr.yml | |
parent | 1f5bdd8445f6ba192618288504b74c1df7c09ea6 (diff) | |
parent | d8d42179590db772cc5b1873385cba7e5afe20df (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/locales/fr.yml')
-rw-r--r-- | config/locales/fr.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 5a64e7a1f..0e1098214 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -661,7 +661,7 @@ fr: stream_entries: click_to_show: Cliquer pour afficher pinned: Pouet épinglé - reblogged: partagé + reblogged: a partagé sensitive_content: Contenu sensible terms: body_html: | |