lewo 65e5bc713b Merge pull request #36845 from jbedo/singularity ... singularity: 2.4 -> 2.4.2		2018-03-14 10:19:10 +01:00
..
config	Merge branch 'master' into nix-2.0	2018-03-03 18:02:35 +01:00
hardware	Merge #35554: nixos/opengl: unhide and document	2018-03-04 17:33:01 +01:00
i18n/input-method
installer	Merge pull request #36850 from teto/virtualisation	2018-03-13 13:40:33 +00:00
misc	Merge #35454: nixos/pump.io: remove	2018-03-04 10:49:25 +01:00
profiles	demo: autologin through xserver	2018-03-05 14:48:01 -06:00
programs	singularity: 2.4 -> 2.4.2	2018-03-12 15:13:31 +11:00
security	Revert "Merge branch 'setuid-wrapper-readlink'"	2018-03-07 17:09:05 -05:00
services	resilio: Adjust option description to 3d17573	2018-03-11 01:18:34 +01:00
system	Merge pull request #36850 from teto/virtualisation	2018-03-13 13:40:33 +00:00
tasks	nixos/network-interfaces: Fix 2 small typos	2018-03-10 16:16:56 +01:00
testing	nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix	2018-01-30 16:57:27 +02:00
virtualisation	Merge pull request #36850 from teto/virtualisation	2018-03-13 13:40:33 +00:00
module-list.nix	singularity: 2.4 -> 2.4.2	2018-03-12 15:13:31 +11:00
rename.nix	nixos/piwik: rename to matomo	2018-02-22 22:03:55 +01:00