Re: [Tails-l10n] master af2bc83382
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
ignifugo at
2017-11-13 19:16
Author:
intrigeri
Date:
2017-11-15 11:23
UTC
To:
Tails L10n
Subject:
Re: [Tails-l10n] master af2bc83382
Hi,
ignifugo:
>> can you merge?
>>
>> master af2bc83382
The merge conflicts with our current master branch.
Can you please merge the official master branch into yours,
resolve conflicts, push and then let us know?
Thanks!