Auteur: sajolida Date: À: The Tails public development discussion list Sujet: Re: [Tails-dev] Review and merge doc/i2p
intrigeri wrote: > sajolida@??? wrote (20 Aug 2014 11:38:07 GMT) :
>> Branch: doc/i2p
>> Ticket: https://labs.riseup.net/code/issues/7766 >> Merge: into stable
>
> Merged, resolved conflicts (for some reason, the proposed branch
> wasn't based on the branch it was supposed to be merged into, i.e.
> stable, and conflicted with it). Thanks!
