kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-29 09:14:59 +00:00
Code Issues Projects Releases Wiki Activity

Fix Merge Conflicts.

Browse Source
This commit is contained in:
Michael Teeuw
2017-03-17 14:32:01 +01:00
parent 15b19925f2
commit 4aec39df7a
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -50,8 +50,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Added console warning on startup when deprecated config options are used
- Add option to display temperature unit label to the current weather module
- Added ability to disable wrapping of news items
- Added `DAYAFTERTOMORROW`, `UPDATE_NOTIFICATION`, `UPDATE_NOTIFICATION_MODULE`, `UPDATE_INFO` to Norwegian translations (`nn` and `nb`).
- Updated Norwegian translation.
- Added hideLoading option for News Feed module
- Added configurable dateFormat to clock module.
### Fixed
- Update .gitignore to not ignore default modules folder.