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

Merge remote-tracking branch 'origin/master' into stable 

Conflicts:
	wiki/src/doc/about/features.es.po
parents 26eeabf2 b20ac695
Expand all 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