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

Merge upstream/develop

Browse Source
This commit is contained in:
Teddy Payet
2018-09-08 23:40:39 +02:00
parent 5dbae7c9d7
commit 5eb0b77a8a
2 changed files with 1143 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2190
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

10
package.json
View File

@@ -49,7 +49,7 @@
"jshint": "^2.9.5",
"mocha": "^4.1.0",
"mocha-each": "^1.1.0",
"spectron": "3.7.x",
"spectron": "^3.8.0",
"stylelint": "^8.4.0",
"stylelint-config-standard": "latest",
"time-grunt": "latest"
@@ -57,18 +57,18 @@
"dependencies": {
"body-parser": "^1.18.2",
"colors": "^1.1.2",
"electron": "^2.0.0",
"electron": "^2.0.4",
"express": "^4.16.2",
"express-ipfilter": "0.3.1",
"feedme": "latest",
"helmet": "^3.9.0",
"iconv-lite": "latest",
"mocha-logger": "^1.0.5",
"mocha-logger": "^1.0.6",
"moment": "latest",
"request": "^2.83.0",
"request": "^2.87.0",
"rrule-alt": "^2.2.7",
"simple-git": "^1.85.0",
"socket.io": "^2.0.4",
"socket.io": "^2.1.1",
"valid-url": "latest",
"walk": "latest"
}