Commit e7ee22b2 authored by Jay Ta'ala's avatar Jay Ta'ala
Browse files

Merge branch 'dev/conky_numix' into development

parents a2ab4df2 3866c98a
Supports Markdown
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