Merge remote-tracking branch 'origin/master'
[kaka/cakelight.git] / .gitignore
2017-08-14 Tomas WenströmMoved config.properties out of the repo
2017-02-12 Tomas Wenströminitial commit