Skip to content
Commit 794edf60 authored by Shea Levy's avatar Shea Levy
Browse files

Merge branch 'nixos-master-test' of git://github.com/copumpkin/nixpkgs

parents 24c0844c b0e1db11
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