summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-packageslists/tails-common.list
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2015-02-10 16:53:24 +0000
committerTails developers <amnesia@boum.org>2015-02-10 16:53:24 +0000
commit3d0b0aac7ecc1cf4345d64c41224fb81db3e749a (patch)
tree85df26ec5fa147b1383e75fa2b6eb4ac995ee9b5 /config/chroot_local-packageslists/tails-common.list
parentc2a7050d7b40603d076aa8aedf0c14683b5af077 (diff)
parente6b8483d7d45a787b22ee07fdac9540ac6a29edc (diff)
Merge remote-tracking branch 'origin/devel' into feature/5525-sandbox-web-browser
Diffstat (limited to 'config/chroot_local-packageslists/tails-common.list')
-rw-r--r--config/chroot_local-packageslists/tails-common.list1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 6b34346..1bde1fe 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -147,6 +147,7 @@ isolinux
ferm
keepassx
kexec-tools
+keyringer
memlockd
less
laptop-mode-tools