Re: [Tails-l10n] master af2bc83382

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

Reply to this message
Author: intrigeri
Date:  
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!

This message was posted to the following mailing lists:
tails-l10n
Mailing List Info | Nearby Messages		<-Re: [Tails-l10n] [fr](pull) signing_key_revocationRe: [Tails-l10n] Spanish translation passed 50% of all website->
lists.autistici.org administrated by postmasterLurker (version 2.3)