Jeremias Arnstadt bc257f4951 Merge branch 'develop' of https://github.com/artifactdev/MagicMirror ...

# Conflicts:
#	modules/default/calendar/README.md
#	modules/default/weatherforecast/README.md

2017-01-29 00:53:07 +01:00

..

alert

Change of examples configuration in README modules.

2017-01-24 17:22:17 -03:00

calendar

Merge branch 'develop' of https://github.com/artifactdev/MagicMirror

2017-01-29 00:53:07 +01:00

clock

Change of examples configuration in README modules.

2017-01-24 17:22:17 -03:00

compliments

Change of examples configuration in README modules.

2017-01-24 17:22:17 -03:00

currentweather

Change of examples configuration in README modules.

2017-01-24 17:22:17 -03:00

helloworld

Change of examples configuration in README modules.

2017-01-24 17:22:17 -03:00

newsfeed

Change of examples configuration in README modules.

2017-01-24 17:22:17 -03:00

updatenotification

Change of examples configuration in README modules.

2017-01-24 17:22:17 -03:00

weatherforecast

Merge branch 'develop' of https://github.com/artifactdev/MagicMirror

2017-01-29 00:53:07 +01:00

defaultmodules.js

Add module 'updatenotification'.

2016-10-15 13:08:46 +02:00