John Ericson ee4b56edd3 Merge remote-tracking branch 'upstream/master' into staging		2018-05-11 14:36:08 -04:00
..
config	treewide: isArm -> isAarch32	2018-04-25 15:28:55 -04:00
hardware	Merge branch 'master' into staging	2018-04-10 09:13:36 +02:00
i18n/input-method	Added cross-references to NixOS manual	2018-04-12 09:39:14 +10:00
installer	nix: 2.0.1 -> 2.0.2	2018-05-04 13:28:36 +02:00
misc	nixos/documentation: Correct use of lib.optional	2018-05-05 15:55:53 +07:00
profiles	base profile: add mkpasswd to system packages	2018-05-09 00:20:02 +03:00
programs	Merge pull request #38831 from rdnetto/improve-cross-refs	2018-04-30 21:30:20 -04:00
security	Merge pull request #39526 (improve dhparams)	2018-05-08 02:09:46 +02:00
services	Merge remote-tracking branch 'upstream/master' into staging	2018-05-11 14:36:08 -04:00
system	Merge pull request #40052 from flokli/input_leds-doc	2018-05-09 07:54:47 +00:00
tasks	lxd: 2.16 -> 3.0.0	2018-04-14 11:02:24 +01:00
testing	nixos/testing: Fix output of systemd messages	2018-05-10 08:21:20 +02:00
virtualisation	nixos/testing: Fix output of systemd messages	2018-05-10 08:21:20 +02:00
module-list.nix	Merge pull request #39099 from teto/qemu_agent	2018-05-10 01:22:52 +02:00
rename.nix	NetworkManager: add noDns option	2018-05-08 13:42:39 +02:00