Skip to content
Commit 76244ac2 authored by Peter Simons's avatar Peter Simons
Browse files

Merge branch 'master' into stdenv-updates 

Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
parents 70edf159 a9406519
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