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

Merge remote-tracking branch 'upstream/master' into JSONEditorMaster

Browse Source 
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/javascript/view/OperationView.js
	src/main/less/screen.less
This commit is contained in:
Laurent Lepinay
2015-12-16 10:25:38 +01:00
parent e051023288 63f6edeef0
commit 2c431d7873
32 changed files with 436 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -12,4 +12,6 @@ swagger-ui.sublime-workspace
.idea
.project
node_modules/*
/nbproject/private/
/nbproject/private/
dist/specs/
test/specs/local/