Skip to content
Commit 89dfbd12 authored by Nikolay Amiantov's avatar Nikolay Amiantov
Browse files

Merge commit 'refs/pull/14936/head' of git://github.com/NixOS/nixpkgs

parents f944f490 fb6ea3de
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