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

Merge branch 'bugfix/7326-systray-icons' into feature/6342-update-camouflage-for-gnome3 

Conflicts:
	config/chroot_local-includes/usr/local/sbin/tails-prepare-win8-theme
parents ba36dc26 bafe089b
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