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

Merge branch 'stable' into testing 

Conflicts:
	config/chroot_apt/preferences
parents 459cf624 e9f3f1db
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