Skip to content
Commit b230153c authored by Jaka Hudoklin's avatar Jaka Hudoklin
Browse files

Merge branch 'master' of https://github.com/NixOS/nixos into nameservers 

Conflicts:
	modules/tasks/network-interfaces.nix
parents 7427639b 7a71320a
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