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

Merge recent master into staging 

Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
parents 5c53f224 2d03fbf7
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