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

Merge remote-tracking branch 'origin/testing' into test/7821-tor 

Conflicts:
	features/support/helpers/misc_helpers.rb
parents c4cd8dbd 5c0364a0
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