kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-09-13 23:55:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Thomas Bachmann
2018-10-29 20:30:37 +01:00
committed by GitHub
parent 85931155e6 4fd87aca09
commit d923ae2107
21 changed files with 1543 additions and 1993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.8",
"simple-git": "^1.85.0",
"socket.io": "^2.0.4",
"socket.io": "^2.1.1",
"valid-url": "latest",
"walk": "latest"
}