Merge remote-tracking branch 'upstream/master'

# Conflicts: # package.json
fluid-project · Jul 25, 2017 · ebc9ab0 · ebc9ab0
2 parents 594ca0d + 6f66f8f
commit ebc9ab0
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 138 deletions.
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "body-parser": "1.17.2",
     "cookie-parser": "1.4.3",
     "express": "4.15.3",
-    "express-session": "1.15.3",
+    "express-session": "1.15.4",
     "infusion": "3.0.0-dev.20170724T165035Z.eee50c1"
   },
   "devDependencies": {