Hi, I've merged this branch. Congrats!
sajolida, given this branch was long derived from devel, and no re-sync' was made for a while, I've encountered a conflict in the doc while merging. I've done my best, but you probably want to add some traillinks to doc/encryption_and_privacy.index. Cheers, -- intrigeri | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc _______________________________________________ tails-dev mailing list [email protected] https://mailman.boum.org/listinfo/tails-dev
