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

Merge recent master into staging 

This would be a fast-forward, but --no-ff seems cleaner in this case.
Hydra nixpkgs: ?compare=1278067
parents e9d3acba cc174b3d
Expand all 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