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
..
activation	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
boot	Merge remote-tracking branch 'upstream/master' into staging	2018-03-13 23:04:18 +02:00
etc	environment.etc: add user/group option	2017-07-29 23:56:46 +01:00