Skip to content
Commit 09f02b91 authored by Nikolay Amiantov's avatar Nikolay Amiantov
Browse files

Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging

parents 48195dd2 f9e5eccb
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