[email protected] 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!

Cheers,
-- 
intrigeri
_______________________________________________
Tails-dev mailing list
[email protected]
https://mailman.boum.org/listinfo/tails-dev
To unsubscribe from this list, send an empty email to 
[email protected].

Reply via email to