Re: [Tails-l10n] [doc][fr] Merge Request

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

Reply to this message
Author: mercedes508
Date:  
To: tails-l10n
Subject: Re: [Tails-l10n] [doc][fr] Merge Request

> Please merge the upstream master branch into your own,
> resolve the conflicts as needed, and ask again :)

hopefully it's now fixed.
So please merge master branch from mercedes508 repo, from this state:

commit a2b9324f

It includes as well updated translations according to this email:

[Tails-l10n] Changes to /download and /doc/first_steps/usb_installation

Thanks.

This message was posted to the following mailing lists:
tails-l10n
Mailing List Info | Nearby Messages		<-Re: [Tails-l10n] [fr] Traduction de l'option Windows Camouflage dans tails-greeterRe: [Tails-l10n] [doc][fr] Merge Request->
lists.autistici.org administrated by postmasterLurker (version 2.3)