Merge branch 'master' of https://github.com/aputinski/react-navigation-controller

Author: programmarchy

README.md

@@ -61,7 +61,7 @@ class App extends React.Component {
       // http://facebook.github.io/rebound-js/docs/rebound.html
       // Defaults to 10
       transitionTension: 12,
-      
+
       // The spring friction for transitions
       // Defaults to 6
       transitionFriction: 5
@@ -202,7 +202,7 @@ call lifecycle events on the component at certain stages.
 Lifecycle events can trigger actions when views transition in or out,
 instead of mounted or unmounted:
 
-```
+```javascript
 class HelloView extends React.Component {
   navigationControllerDidShowView() {
     // Do something when the show transition is finished,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-controller",
-  "version": "1.0.3",
+  "version": "2.1.0",
   "description": "React view manager similar to UINavigationController",
   "keywords": [
     "react",
@@ -20,9 +20,6 @@
     "url": "git@github.com:aputinski/react-navigation-controller.git"
   },
   "author": "Adam Putinski",
-  "peerDependencies": {
-    "react": "^0.13.0"
-  },
   "dependencies": {
     "classnames": "^2.1.3",
     "rebound": "0.0.13"