Enabling os x#24

Open

tahasamad wants to merge 2 commits intomindsnacks:mainfrom

Commits on Dec 8, 2016

Enabling os x
Taha Samad
committed

Commits on Dec 19, 2016

Merging upstream/master
Taha Samad
committed