Skip to content
Snippets Groups Projects
Commit 63448f4c authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'master' of git://git.tails.boum.org/tails 

Conflicts:
	wiki/src/support/faq.mdwn
parents a54254b3 cd0848c1
Hide 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