tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2018-04-03 19:17:20 +00:00
parent 1f5bdd8445 d8d4217959
commit 6611100480
70 changed files with 924 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/fr.yml
View File

@ -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: |