Author: intrigeri Date: To: Tails localization discussion Subject: Re: [Tails-l10n] [pull](fr)Call for translations: 1.3
matsa wrote (22 Feb 2015 22:58:19 GMT) : > Short version: please pull from matsa / translation / 0911f3c
I tried to merge that into master but there were merge conflicts.
Please merge current master into the proposed branch, resolve
conflicts, and ask again. Thanks!