Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3102-unguarded-expressions

# Conflicts:
#	src/core/components/model.jsx
#	src/core/components/models.jsx
This commit is contained in:
Owen Conti
2017-07-03 16:12:31 -06:00
74 changed files with 811 additions and 395 deletions

View File

@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react"
import React, { Component } from "react"
import PropTypes from "prop-types"
export default class Model extends Component {
static propTypes = {