Merge remote-tracking branch 'origin/master' into synchronicity

Author: timdorr

examples/basic/app.js

@@ -6,7 +6,7 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import { createStore, combineReducers } from 'redux'
 import { Provider } from 'react-redux'
-import { Router, Route, IndexRoute, hashHistory } from 'react-router'
+import { Router, Route, IndexRoute, browserHistory } from 'react-router'
 import { syncHistoryWithStore, routerReducer } from 'react-router-redux'
 
 import * as reducers from './reducers'
@@ -18,8 +18,7 @@ const reducer = combineReducers({
 })
 
 const DevTools = createDevTools(
-  <DockMonitor toggleVisibilityKey="ctrl-h"
-               changePositionKey="ctrl-q">
+  <DockMonitor toggleVisibilityKey="ctrl-h" changePositionKey="ctrl-q">
     <LogMonitor theme="tomorrow" preserveScrollTop={false} />
   </DockMonitor>
 )
@@ -28,7 +27,7 @@ const store = createStore(
   reducer,
   DevTools.instrument()
 )
-const history = syncHistoryWithStore(hashHistory, store)
+const history = syncHistoryWithStore(browserHistory, store)
 
 ReactDOM.render(
   <Provider store={store}>

examples/basic/package.json

@@ -7,9 +7,9 @@
     "react": "^0.14.7",
     "react-dom": "^0.14.7",
     "react-redux": "^4.3.0",
-    "react-router": "^2.0.0-rc5",
+    "react-router": "^2.0.0",
     "redux": "^3.2.1",
-    "react-router-redux": "^3.0.0"
+    "react-router-redux": "^4.0.0"
   },
   "devDependencies": {
     "babel-core": "^6.4.5",