Merge branch 'develop' into api-v3

2016-04-08 21:31:41 -05:00
parent 68ff26e6d6 e6b5a6820f
commit 8a42a3a51e
59 changed files with 11692 additions and 11518 deletions
@@ -67,7 +67,7 @@
    "mongoose-id-autoinc": "~2013.7.14-4",
    "morgan": "^1.7.0",
    "nconf": "~0.8.2",
-    "newrelic": "~1.25.0",
+    "newrelic": "~1.26.1",
    "nib": "~1.0.1",
    "nodemailer": "^1.9.0",
    "object-path": "^0.9.2",