Skip to content
Commit 91f2c362 authored by Peter Simons's avatar Peter Simons
Browse files

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

Conflicts:
	pkgs/top-level/all-packages.nix
parents f7bec094 e1c9c133
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