Skip to content
Commit 1278859d authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into x-updates 

Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
parents d4561be1 0c020c98
Hide whitespace changes
Inline Side-by-side
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