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

Merge branch 'master' into staging-next 

There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
parents bc238b8d f188bad6
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