Merge branch 'master' into ft/oas3

2017-07-04 23:50:00 -07:00
parent 8ed43a1329 b2b9e84e11
commit 4e80e292b2
79 changed files with 1088 additions and 599 deletions
--- a/src/core/components/info.jsx
+++ b/src/core/components/info.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from "react"
+import React from "react"
+import PropTypes from "prop-types"
 import { fromJS } from "immutable"
 import ImPropTypes from "react-immutable-proptypes"