diff options
| author | JohnD28 <32609514+JohnD28@users.noreply.github.com> | 2017-10-12 15:25:34 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-12 15:25:34 +0200 |
| commit | 691e9112f373e82829f53cb9ffc7bd19e4c875b1 (patch) | |
| tree | 2a283c80a7d109c6ab7b3e7ed99edb0f96df1349 /config/environment.rb | |
| parent | 385df2c5a0f1d6d74b92987639890ad724de219b (diff) | |
Update fr.yml (#5330)
* Update fr.yml Update of french translation and reformatting Privacy Policy for better maintenance. * Update fr.yml * Update fr.yml * Update fr.yml Corrections suivant les remarques d'Alda. * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml I have replaced my proposals with those accepted here to reduce the conflict. https://github.com/tootsuite/mastodon/pull/5340 J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit. Comment dois-je faire à l'avenir pour éviter ce genre de situations ? * Update fr.yml Conflict reduction.
Diffstat (limited to 'config/environment.rb')
0 files changed, 0 insertions, 0 deletions