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

This message is part of the following thread:
Mthe complete thread tree sorted by date
Mmercedes508 at <-
 
Delete this message

Reply to this message
Author: intrigeri
Date:  
To: Tails localization discussion
Subject: 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.

This message was posted to the following mailing lists:
tails-l10n
Mailing List Info | Nearby Messages		<-[Tails-l10n] (review)[de] wiki/src/news/version_1.3.de.poRe: [Tails-l10n] [fr] (merge) Branche testing->
lists.autistici.org administrated by postmasterLurker (version 2.3)