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

Merge branch 'stable' into devel 

Conflicts:
	debian/changelog
parents ecb75555 5ea0db31
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