Skip to content
Commit ed93d66b authored by Tails developers's avatar Tails developers
Browse files

Merge remote-tracking branch 'origin/master' into testing

Conflicts:
	wiki/src/doc/first_steps/manual_usb_installation/linux.fr.po
	wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fr.po
parents 48dac022 feaff0e3
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment