Fix Merge Issue

This commit is contained in:
Michael Teeuw
2019-06-27 09:27:24 +02:00
2 changed files with 4 additions and 3 deletions

View File

@@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Add `broadcastPastEvents` config option for calendars to include events from the past `maximumNumberOfDays` in event broadcasts
- Added feature to broadcast news feed items `NEWS_FEED` and updated news items `NEWS_FEED_UPDATED` in default [newsfeed](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/newsfeed) module (when news is updated) with documented default and `config.js` options in [README.md](https://github.com/MichMich/MagicMirror/blob/develop/modules/default/newsfeed/README.md)
- Added notifications to default `clock` module broadcasting `CLOCK_SECOND` and `CLOCK_MINUTE` for the respective time elapsed.
- Added to `newsfeed.js`: in order to design the news article better with css, three more class-names were introduced: newsfeed-desc, newsfeed-desc, newsfeed-desc
Added UK Met Office Datapoint feed as a provider in the default weather module.
- added new provider class