Merge branch 'master' into staging

This commit is contained in:
Jan Tojnar 2018-12-24 15:02:29 +01:00
commit ef935fa101
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
336 changed files with 5417 additions and 2469 deletions

View file

@ -154,6 +154,7 @@
./security/chromium-suid-sandbox.nix
./security/dhparams.nix
./security/duosec.nix
./security/google_oslogin.nix
./security/hidepid.nix
./security/lock-kernel-modules.nix
./security/misc.nix
@ -303,6 +304,7 @@
./services/hardware/usbmuxd.nix
./services/hardware/thermald.nix
./services/hardware/undervolt.nix
./services/hardware/vdr.nix
./services/logging/SystemdJournal2Gelf.nix
./services/logging/awstats.nix
./services/logging/fluentd.nix