kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-02 05:53:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into master

Browse Source
This commit is contained in:
Michael Teeuw 2020-01-02 16:13:30 +01:00 committed by GitHub
commit 0a4df191a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -10,7 +10,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
*This release is scheduled to be released on 2020-04-01.*
### Added
### Updated
### Fixed
- Force declaration of public ip adress in config file (ISSUE #1852)

2
package-lock.json generated
View File

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

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "magicmirror",
"version": "2.10.0",
"version": "2.11.0-develop",
"description": "The open source modular smart mirror platform.",
"main": "js/electron.js",
"scripts": {