Skip to content
Commit b1916b45 authored by Tuomas Tynkkynen's avatar Tuomas Tynkkynen
Browse files

Merge remote-tracking branch 'upstream/staging' into gcc-7 

Conflicts:
	pkgs/development/libraries/libidn/default.nix
	pkgs/top-level/all-packages.nix
parents 0a941e0b 79e7f7af
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