Merge pull request #20 from rocjs/fix/use-fork-of-react-router-redux

Changed react-router-redux to a temporary fork that fixes routing
rocjs · Jun 3, 2016 · cd98e88 · cd98e88
2 parents c2a1919 + da67164
commit cd98e88
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 sudo: required
 language: node_js
 node_js:
-    - 4.2
     - stable
 before_script:
     - npm run link

diff --git a/packages/roc-package-web-app-react/package.json b/packages/roc-package-web-app-react/package.json
@@ -38,7 +38,7 @@
     "react-redux": "~4.4.5",
     "react-router": "~2.3.0",
     "react-router-redial": "~0.2.1",
-    "react-router-redux": "~4.0.2",
+    "react-router-redux": "dlmr/react-router-redux#fix-inital-server-load-dist",
     "react-server-status": "~1.0.0",
     "redial": "~0.4.1",
     "redux": "~3.4.0",