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

Merge remote-tracking branch 'origin/testing' into feature/sdio

Conflicts:
	wiki/src/doc/first_steps/installation.fr.po
	wiki/src/doc/first_steps/persistence.fr.po
	wiki/src/doc/first_steps/persistence/configure.fr.po
	wiki/src/doc/first_steps/upgrade.fr.po
	wiki/src/support/known_issues.fr.po
	wiki/src/support/troubleshooting.fr.po
parents 4330d24d 602c31e1
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