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

Merge branch 'master' into testing

Conflicts:
	wiki/src/support/known_issues.de.po
	wiki/src/support/known_issues.es.po
	wiki/src/support/known_issues.fr.po
	wiki/src/support/known_issues.pt.po
parents 50709c1e 9b21482e
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment