Merge remote-tracking branch 'origin/master'

2017-10-03 16:04:33 -05:00 · 2017-10-03 16:04:33 -05:00 · 438effda5b
parent 7ed986d0d7 70aaad21fb
commit 438effda5b
2 changed files with 1376 additions and 337 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -14,6 +14,7 @@
    "debug": "~2.6.3",
    "express": "~4.15.2",
    "express-ipfilter": "^0.3.1",
+    "forever": "^0.15.3",
    "humanize": "0.0.9",
    "jade": "~1.11.0",
    "jsonfile": "^3.0.1",