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

Nachricht löschen

Nachricht beantworten
Autor: intrigeri
Datum:  
To: Tails localization discussion
Betreff: 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.