-
Tails developers authored
Conflicts: auto/config config/amnesia config/chroot_local-hooks/51-module-assistant config/chroot_local-includes/etc/default/kexec config/chroot_local-includes/etc/memlockd.cfg
035cf102
Conflicts: auto/config config/amnesia config/chroot_local-hooks/51-module-assistant config/chroot_local-includes/etc/default/kexec config/chroot_local-includes/etc/memlockd.cfg