Re: [Tails-l10n] [fr] (merge) Branche master
Català
Dansk
Deutsch
Ελληνικά
English
Español
suomi
Français
Galego
magyar
Italiano
日本語
Nederlands
Polski
Português
Português Brasileiro
This message is part of the following thread:
the complete thread tree sorted by date
mercedes508 at
2015-02-24 20:19
Author:
intrigeri
Date:
2015-02-24 22:05
UTC
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.