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

Merge master into #2129 

Conflicts (easy, just UID shifted):
	nixos/modules/misc/ids.nix
	nixos/modules/module-list.nix
parents 177aef8b 665b2c82
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