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

Merge remote-tracking branch 'origin/testing' into feature/6342-update-camouflage-for-gnome3 

Conflicts:
	wiki/src/contribute/release_process/test.mdwn
parents 57b1a17d 8d117c88
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