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

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

Conflicts:
	wiki/src/contribute/design.mdwn
	wiki/src/todo/automated_builds_and_tests/cucumber.mdwn
parents 734f291f 533f5289
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment