Skip to content
Commit 609f8dc0 authored by Mathijs Kwik's avatar Mathijs Kwik
Browse files

Merge branch 'master' into stdenv-updates 

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