Merge branch 'Grand-Prix-Cycliste-de-Québec-3.3.x' into feature/start…

…-adding-flow
ansble · Dec 11, 2017 · 9fe87e5 · 9fe87e5
2 parents c481806 + e78b067
commit 9fe87e5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/history.md b/history.md
@@ -1,4 +1,11 @@
-### - 3.3.4 * 2017-12-8 18:33:29 *
+### - 3.3.5 * 2017-12-11 06:55:28 *
+
+   - Merge pull request #507 from ansble/greenkeeper/harken-1.2.7
+  - fix(package): update harken to version 1.2.7
+  - Merge pull request #504 from ansble/Grand-Prix-Cycliste-de-Québec-3.3.x 
+
+
+ ### - 3.3.4 * 2017-12-8 18:33:29 *
 
    - updates package lock file 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monument",
-  "version": "3.3.4",
+  "version": "3.3.5",
   "description": "evented routing for nodejs for use on the server and in the client. Isomorphic!",
   "main": "built/index.js",
   "scripts": {
@@ -56,7 +56,7 @@
     "dot": "1.1.2",
     "etag": "1.8.1",
     "glob": "7.1.2",
-    "harken": "1.2.6",
+    "harken": "1.2.7",
     "iltorb": "2.0.3",
     "lodash.clonedeep": "4.5.0",
     "lodash.pick": "4.4.0",