3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos/modules/system
Oliver Charles 42ae633445 Merge branch 'master' into dbus-switch-to-configuration
Conflicts:
	nixos/modules/system/activation/switch-to-configuration.pl
2014-04-20 19:17:05 +01:00
..
activation Merge branch 'master' into dbus-switch-to-configuration 2014-04-20 19:17:05 +01:00
boot Fix GRUB 2 example 2014-04-20 19:41:15 +02:00
etc
upstart upstart: Oneshot rules should always have Restart=no 2014-04-16 01:04:52 +02:00