Update fh-mbaas-api to use fh.cache api with jdg support

feedhenry-templates · Nov 23, 2015 · 232ef29 · 232ef29
1 parent 4fbb021
commit 232ef29
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,10 @@ node_js:
   - "0.10"
 sudo: false
 before_install:
+<<<<<<< HEAD
   - npm install -g npm@2.13.5
+=======
+  - npm install -g npm@2.14.9
+>>>>>>> Use npm v2 for travis
   - npm install -g grunt-cli
 install: npm install
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "dependencies": {
     "express": "4.0.0",
-    "fh-mbaas-api": "5.3.5",
+    "fh-mbaas-api": "5.6.0-201",
     "request": "2.34.0",
     "body-parser": "~1.0.2",
     "cors": "~2.2.0",