Skip to content
Commit 9407832d authored by Peter Simons's avatar Peter Simons
Browse files

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

Conflicts:
	pkgs/development/libraries/gettext/default.nix
parents e4f6e4b1 95c8d048
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