summaryrefslogtreecommitdiffstats
path: root/features/emergency_shutdown.feature
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-08-01 14:21:26 +0000
committerintrigeri <intrigeri@boum.org>2016-08-01 14:21:26 +0000
commit93d9a0e907d988d150605022329d5cb9dc517b63 (patch)
tree7fdecfee66f13d32d5e533fded66222a37c048bc /features/emergency_shutdown.feature
parent41cbd2f36f5cfea5ca6d1e2444a8e22fa4456996 (diff)
parent5a1023db8843995b404e144df3bcc3117ee61321 (diff)
parent688079e645fb743317c2e21a747040648211a1ab (diff)
parentab945106e9b4713761d81fb9ec1f04166b3fa2b6 (diff)
parent0c2b12f736151edbd5c4b1066698d2b9cd358e5d (diff)
parent1b8c14a6c5e67ab3e16c700532b596dc9625f925 (diff)
Merge remote-tracking branches 'origin/feature/5650-rngd', 'origin/feature/10298-linux-4.x-aufs-kaslr', 'origin/feature/11351-tor-0.2.8', 'origin/feature/10190-OpenPGP-applet-from-Debian' and 'origin/test/11588-usb-on-jenkins+10733' into feature/from-intrigeri-for-2.6