Skip to content
Commit 24366adf authored by Peter Simons's avatar Peter Simons
Browse files

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

parents 2f428bbb 35cd1850
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