Merge v2.3.1

This commit is contained in:
Michael Teeuw
2018-04-01 19:17:08 +02:00
5 changed files with 1309 additions and 4 deletions

View File

@@ -58,7 +58,7 @@
"dependencies": {
"body-parser": "^1.18.2",
"colors": "^1.1.2",
"electron": "^1.7.13",
"electron": "^1.4.15",
"express": "^4.16.2",
"express-ipfilter": "0.3.1",
"feedme": "latest",