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

Merge recent master into x-updates

Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
parents 65ac375a cd3ba19e
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