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

Delete this message

Reply to this message
Auteur: intrigeri
Datum:  
Aan: Tails localization discussion
Onderwerp: 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.