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

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

Conflicts:
	wiki/src/about.fr.po
	wiki/src/doc/first_steps/persistence/configure.mdwn
parents 42ad27cd dd8c43ed
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