kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
parent d27cae0085 b2b9e84e11
commit 15e105c931
74 changed files with 811 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/components/object-model.jsx
View File

@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react"
import React, { Component, } from "react"
import PropTypes from "prop-types"
import { List } from "immutable"
const braceOpen = "{"