Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size ... Let's get rid of those merge conflicts.		2016-02-03 16:57:19 +01:00
..
config	Merge recent 'staging' into closure-size	2016-02-03 16:57:19 +01:00
hardware
installer	Merge recent 'staging' into closure-size	2016-02-03 16:57:19 +01:00
misc
profiles
programs
security	Merge recent 'staging' into closure-size	2016-02-03 16:57:19 +01:00
services	Merge recent 'staging' into closure-size	2016-02-03 16:57:19 +01:00
system	Merge recent 'staging' into closure-size	2016-02-03 16:57:19 +01:00
tasks
testing
virtualisation	Merge recent 'staging' into closure-size	2016-02-03 16:57:19 +01:00
module-list.nix
rename.nix