Sarah Brofeldt 45241c5cd1 Merge pull request #37272 from erictapen/manual-networking ... nixos/manual: fixed example config for networking.interfaces		2018-03-18 17:50:37 +01: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	Remove top-level kde5 attribute	2017-02-27 11:49:10 -06:00
installer	Merge pull request #36850 from teto/virtualisation	2018-03-13 13:40:33 +00:00
misc	18.09: Jackrabbit -> Jellyfish	2018-03-16 12:26:03 +01:00
profiles	demo: autologin through xserver	2018-03-05 14:48:01 -06:00
programs	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
security	nixos/security: fix description of sudo.wheelNeedsPassword	2018-03-16 21:50:46 +00:00
services	nixos home-assistant: a couple of fixes (#36338)	2018-03-18 12:46:36 +01:00
system	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
tasks	nixos/manual: fixed example config for networking.interfaces	2018-03-17 19:53:06 +01:00
testing	nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix	2018-01-30 16:57:27 +02:00
virtualisation	qemu-vm: passing QEMU_NET_OPTS would fail	2018-03-17 23:21:27 +09: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