Merge remote-tracking branch 'matsa/bugfix/8071-Do-not-suspend-to-RAM-when-closing-lid' into stable

dbecbc08 · Tails developers · 044c8be6 · a18614ac · dbecbc08
Commit dbecbc08 authored Jan 06, 2015 by Tails developers
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults ...oot_local-includes/etc/dconf/db/local.d/00_Tails_defaults +1 -0

No files found.
--- a/config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults
+++ b/config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults
@@ -58,3 +58,4 @@ button-sleep = 'shutdown'
 button-suspend = 'shutdown'
 critical-battery-action = 'shutdown'
 lid-close-ac-action = 'blank'
+lid-close-battery-action = 'blank'