Merge branch 'develop' into new_cal

This commit is contained in:
sam detweiler 2020-10-05 13:11:11 -05:00 committed by GitHub
commit 35d516ad4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions

View File

@ -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
View File

@ -1,6 +1,6 @@
{
"name": "magicmirror",
"version": "2.13.0",
"version": "2.14.0-develop",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -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": {