Skip to content
Commit b74793bd authored by obadz's avatar obadz
Browse files

Merge branch 'master' into staging 

Conflicts:
	pkgs/tools/system/facter/default.nix
parents f3c994ca 898edb0f
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