Skip to content
Commit 04656c6f authored by Aristid Breitkreuz's avatar Aristid Breitkreuz
Browse files

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

parents c03c7791 161fdec0
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