Michael Teeuw 29d87d7c48 Merge branch 'patch-4' of https://github.com/yo-less/MagicMirror into yo-less-patch-4 ...

# Conflicts:
#	CHANGELOG.md

2016-10-01 11:03:05 +02:00

..

alert

small fix

2016-06-27 16:15:53 +00:00

calendar

Merge branch 'patch-4' of https://github.com/yo-less/MagicMirror into yo-less-patch-4

2016-10-01 11:03:05 +02:00

clock

Merge pull request #437 from andyipod1437/develop

2016-09-11 21:16:07 +02:00

compliments

Standardize: TO JSCS!

2016-04-05 14:35:11 -04:00

currentweather

currentweather module api url bugfix

2016-09-05 19:06:21 -06:00

helloworld

Fix #153

2016-04-13 09:27:30 +02:00

newsfeed

Update README.md

2016-08-30 15:57:52 +02:00

weatherforecast

Fix default weather forecast module api URL

2016-09-18 10:54:20 -07:00

defaultmodules.js

Standardize: TO JSCS!

2016-04-05 14:35:11 -04:00