Re: [Tails-l10n] master af2bc83382

Delete this message

Reply to this message
Autor: intrigeri
Data:  
Para: Tails L10n
Assunto: 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!