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

Merge branch 'master' into devel 

Conflicts:
	wiki/src/todo/persistence.mdwn
parents d1c81875 3fcfd76a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment