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

Merge branch 'master' of git://github.com/hrdinka/nixpkgs 

conky: add config options
parents 2d97dd3f 26d5d506
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