Frederik Rietdijk 419bc0a4cd Revert "Revert "Merge master into staging-next"" ... In 87a19e9048 I merged staging-next into master using the GitHub gui as intended. In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master. Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master. This reverts commit 0be87c7979.		2020-02-05 19:41:25 +01:00
..
config	nixos/resolvconf: Remove useHostResolvConf option	2020-02-05 00:28:32 +01:00
hardware	openrazer: 2.6.0 -> 2.7.0	2020-02-03 10:00:35 -08:00
i18n/input-method	nixos/ibus: fix missing dconf profile	2020-01-06 20:30:37 +09:00
installer	Revert "Revert "Merge master into staging-next""	2020-02-05 19:41:25 +01:00
misc	Revert "Revert "Merge master into staging-next""	2020-02-05 19:41:25 +01:00
profiles	nixos/plasma5: drop enableQt4Support option	2019-11-22 09:01:05 +01:00
programs	Merge pull request #78660 from buckley310/dircolors	2020-02-05 09:08:41 +01:00
security	nixos/duosec: fix configuration issue with "groups" option	2020-01-30 14:16:17 -05:00
services	Revert "Revert "Merge master into staging-next""	2020-02-05 19:41:25 +01:00
system	Revert "Revert "Merge master into staging-next""	2020-02-05 19:41:25 +01:00
tasks	nixos/networking-interfaces: change preferTempAddress to allow disabling temp addresses	2020-02-01 11:38:40 +01:00
testing	nixos/testing: remove leftover of virtualisation.qemu.program	2019-08-29 10:12:13 +02:00
virtualisation	nixos/lxd: add package options for LXC, LXD and ZFS (#73902)	2020-01-30 14:51:12 +00:00
module-list.nix	Merge pull request #78543 from Atemu/dnscrypt-proxy2-service	2020-02-02 23:02:06 -05:00
rename.nix	nixos/dnscrypt-proxy2: init	2020-02-02 11:11:27 -05:00