Autor: intrigeri
Datum:
To: Tails localization discussion
Betreff: Re: [Tails-l10n] [pull](fr) Updated translations for problematic
USB sticks
> The conflicts should be fixed in matsa/ master/ 23aef3e
Merged, thanks!
> I had to cherry-pick, tell me if I did something wrong.
As long as you're playing with your local commits that were never
published, feel free to cherry-pick / rebase / whatever at will :)