Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/development/tools/build-managers/conan/default.nix		2018-03-13 23:04:18 +02:00
..
config	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
hardware	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
i18n/input-method
installer	Merge pull request #36850 from teto/virtualisation	2018-03-13 13:40:33 +00:00
misc	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
profiles	demo: autologin through xserver	2018-03-05 14:48:01 -06:00
programs	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
security	Revert "Merge branch 'setuid-wrapper-readlink'"	2018-03-07 17:09:05 -05:00
services	Merge remote-tracking branch 'upstream/master' into staging	2018-03-13 23:04:18 +02:00
system	Merge remote-tracking branch 'upstream/master' into staging	2018-03-13 23:04:18 +02:00
tasks	Merge remote-tracking branch 'upstream/master' into staging	2018-03-13 23:04:18 +02:00
testing
virtualisation	Merge remote-tracking branch 'upstream/master' into staging	2018-03-13 23:04:18 +02:00
module-list.nix	Merge #35454: nixos/pump.io: remove	2018-03-04 10:49:25 +01:00
rename.nix	nixos/piwik: rename to matomo	2018-02-22 22:03:55 +01:00