Skip to content
Commit 5a98b9f5 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge recent master into p/stdenv 

Merged just before the pypi update, as it seems to cause problems on Hydra.
parents 5e37c09f e1a0d45d
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