Gregor Kleen 79eebad055 Fix incorrect merge		2018-04-21 22:34:39 +02:00
..
config	nixos/pulseaudio: pulseaudio.enable should imply sound.enable	2018-04-14 19:12:47 +01:00
hardware	Merge branch 'master' into staging	2018-04-10 09:13:36 +02:00
i18n/input-method
installer	nix: 2.0 -> 2.0.1	2018-04-20 23:37:18 +02:00
misc	Merge pull request #38485 from obsidiansystems/nixos-nixpkgs-options	2018-04-19 14:59:58 -04:00
profiles	Merge pull request #38114 from oxij/nixos/doc-module	2018-04-05 07:09:32 +00:00
programs	nixos: enable bash command completion by default	2018-04-13 18:36:51 +02:00
security	Fix incorrect merge	2018-04-21 22:34:39 +02:00
services	Merge pull request #30908 from kierdavis/boinc-fhs	2018-04-21 15:25:58 -05:00
system	Merge pull request #38356 from Infinisil/fix/environment	2018-04-20 22:22:05 +02:00
tasks	lxd: 2.16 -> 3.0.0	2018-04-14 11:02:24 +01:00
testing	nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix	2018-01-30 16:57:27 +02:00
virtualisation	Merge pull request #35541 from xeji/containers-extraflags	2018-04-21 14:16:49 +01:00
module-list.nix	nixos/restic: init (#38948)	2018-04-21 11:12:43 +01:00
rename.nix	Merge pull request #36864 from peterhoeg/f/ddclient	2018-04-19 05:12:29 +00:00