Skip to content
Commit 5f195425 authored by Nikolay Amiantov's avatar Nikolay Amiantov
Browse files

Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging

parents 09f02b91 69a07248
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