Re: [Tails-l10n] [fr] (merge) Branche master

Borrar esta mensaxe

Responder a esta mensaxe
Autor: intrigeri
Data:  
Para: Tails localization discussion
Asunto: Re: [Tails-l10n] [fr] (merge) Branche master
I've tried merging matsa/master (at commit 8961284) into current
master, and there were merge conflicts => please resolve and
resubmit, thanks.