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

Merge branch 'feature/7367-browser-camouflage' into feature/6342-update-camouflage-for-gnome3 

Conflicts:
	config/chroot_local-includes/usr/local/bin/tails-activate-win8-theme
parents a38e67f6 bff4ebe5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment