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

Merge branch 'bugfix/7407-early-icon-theme' into feature/6342-update-camouflage-for-gnome3

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