obadz c7142c1aa3 Merge branch 'master' into staging		2016-08-28 13:33:13 +01:00
..
config
hardware
i18n/input-method	Merge pull request #15025 from ericsagnes/modules/manual	2016-08-28 13:57:34 +02:00
installer
misc	Merge pull request #15025 from ericsagnes/modules/manual	2016-08-28 13:57:34 +02:00
profiles
programs
security	Merge pull request #15025 from ericsagnes/modules/manual	2016-08-28 13:57:34 +02:00
services	Merge pull request #15025 from ericsagnes/modules/manual	2016-08-28 13:57:34 +02:00
system	Merge branch 'master' into staging	2016-08-28 13:33:13 +01:00
tasks
testing
virtualisation	virtualbox-image: remove raw image (hopefully fixes ova tests)	2016-08-28 11:33:15 +01:00
module-list.nix
rename.nix	Merge pull request #14311 from Profpatsch/mkRemovedOptionModule-replacement	2016-08-28 13:55:28 +02:00