-
Tails developers authored
Conflicts: config/chroot_apt/preferences config/chroot_local-includes/etc/iceweasel/profile/user.js config/chroot_local-packageslists/tails-common.list
76c51808
Conflicts: config/chroot_apt/preferences config/chroot_local-includes/etc/iceweasel/profile/user.js config/chroot_local-packageslists/tails-common.list