Merge branch 'master' of github.com:beanloop/react-toolbox-components

Author: Pajn

package.json

@@ -25,7 +25,7 @@
     "tslint-config-beanloop": "^0.1.0"
   },
   "dependencies": {
-    "@types/react": "^0.14.55",
+    "@types/react": "^15.0.14",
     "react-form-helper": "^0.2.1",
     "react-with-media": "^0.1.0",
     "recompose": "^0.21.2",

yarn.lock

@@ -14,14 +14,14 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.2.tgz#04e9b560b118eaf48542945ef9b2701c3f9832e3"
 
-"@types/react@^0.14.55":
-  version "0.14.57"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-0.14.57.tgz#1878a8654fafdd1d381b8457292b6433498c5b62"
-
 "@types/react@^15.0.0":
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-15.0.0.tgz#33eb3438130614f25c07c09e46ebec5a8d45b3b0"
 
+"@types/react@^15.0.14":
+  version "15.0.14"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-15.0.14.tgz#07a739b20b0d4cf946f52444d3c40a94d4a234b1"
+
 Base64@~0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/Base64/-/Base64-0.2.1.tgz#ba3a4230708e186705065e66babdd4c35cf60028"