Skip to content
Commit 45e8de9a authored by Peter Simons's avatar Peter Simons
Browse files

Merge branch 'origin/master' into stdenv-updates. 

Conflicts:
	pkgs/tools/misc/less/default.nix
parents 2bc29e4e 60103a4b
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