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

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

Conflicts:
	debian/changelog
parents 0462fba6 aa3021d2
Expand all 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