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

Merge branch 'develop' into fix_modules_array

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Karsten Hassel
2020-12-29 22:24:19 +01:00
parent e507f95b2a a857412f13
commit e6cefcf948
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -56,6 +56,7 @@ _This release is scheduled to be released on 2021-01-01._
- update Node-ical 0.12.4 , fix invalid RRULE format in cal entries
- fix package.json for optional electron dependency (2378)
- update node-ical version again, 0.12.5, change RRULE fix (#2371, #2379)
- Added missing function call in module.show()
- remove undefined objects from modules array (#2382)
## [2.13.0] - 2020-10-01