Autor: intrigeri
Data:
Dla: xin, Tails localization discussion
Temat: Re: [Tails-l10n] [fr](pull) misc
xin:
> I fix conflicts in this branch, I don't think it need a new review.
> The last commit is now 28d08c13d2a766c30479c67a43c1d584053046a6.
Merging, thinks!