Skip to content
Snippets Groups Projects
Commit 7caa39da authored by Tails developers's avatar Tails developers
Browse files

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

Conflicts:
	config/chroot_local-includes/etc/iceweasel/pref/000-tor-browser.js
parents 42ea0039 79e2772a
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment