-
intrigeri authored
Conflicts: auto/build config/chroot_apt/preferences config/chroot_local-packageslists/tails-common.list config/chroot_local-patches/gdm-background.diff features/images/UnsafeBrowserStartVerification.png features/step_definitions/apt.rb features/step_definitions/evince.rb po/POTFILES.in wiki/src/contribute/design/memory_erasure.mdwn wiki/src/support/known_issues.mdwn
40dcfbfd