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

Merge remote-tracking branch 'mercedes508/testing' 

Conflicts:
	wiki/src/news/version_0.21.fr.po
	wiki/src/security/Numerous_security_holes_in_0.20.1.fr.po
	wiki/src/support/known_issues.fr.po
parents e5fb5bfd 5859f934
Expand all 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