Skip to content
Commit 8af32fb4 authored by Frederik Rietdijk's avatar Frederik Rietdijk
Browse files

Merge staging-next into master 

This brings in the NIX_PYTHONEXECUTABLE change to unblock the
nixos-unstable channel.
parents bca933e2 f441d3e3
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