Skip to content
Commit 42ae6334 authored by Oliver Charles's avatar Oliver Charles
Browse files

Merge branch 'master' into dbus-switch-to-configuration

Conflicts:
	nixos/modules/system/activation/switch-to-configuration.pl
parents 41775167 31a94915
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment