kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-12-12 18:02:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix conflict with CHANGELOG, merge with upstream/develop

Browse Source
This commit is contained in:
Andrew McOlash
2017-03-17 07:08:00 -05:00
parent e2099f0749
commit a18e7eb089
24 changed files with 579 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md Executable file → Normal file
View File

@@ -49,7 +49,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Korean Translation.
- Added console warning on startup when deprecated config options are used
- Added `DAYAFTERTOMORROW`, `UPDATE_NOTIFICATION`, `UPDATE_NOTIFICATION_MODULE`, `UPDATE_INFO` to Norwegian translations (`nn` and `nb`).
- Add option to display temperature unit label
- Add option to display temperature unit label for current weather module
### Fixed
- Update .gitignore to not ignore default modules folder.