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

Merge branch 'doc/7118-erase_available_disk_warning' (Closes: #7118) 

Conflicts:
	wiki/src/doc/encryption_and_privacy/secure_deletion.mdwn
parents dcc0a7d3 2bebb0e7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment