mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-29 20:49:54 +00:00
Merge branch 'develop' into new_cal
This commit is contained in:
commit
35d516ad4d
10
CHANGELOG.md
10
CHANGELOG.md
@ -5,6 +5,16 @@ This project adheres to [Semantic Versioning](https://semver.org/).
|
||||
|
||||
❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror²
|
||||
|
||||
## [2.14.0] - Unreleased (Develop Branch)
|
||||
|
||||
_This release is scheduled to be released on 2021-01-01._
|
||||
|
||||
### Added
|
||||
|
||||
### Updated
|
||||
|
||||
### Deleted
|
||||
|
||||
### Fixed
|
||||
|
||||
- Calendar parsing where RRULE bug returns wrong date, add Windows timezone name support
|
||||
|
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "magicmirror",
|
||||
"version": "2.13.0",
|
||||
"version": "2.14.0-develop",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "magicmirror",
|
||||
"version": "2.13.0",
|
||||
"version": "2.14.0-develop",
|
||||
"description": "The open source modular smart mirror platform.",
|
||||
"main": "js/electron.js",
|
||||
"scripts": {
|
||||
|
Loading…
x
Reference in New Issue
Block a user