Merge remote-tracking branch 'swagger/develop_2.0' into JSONEditorMerge

Browse Source

Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/html/index.html
	src/main/template/param.handlebars
	src/main/template/param_required.handlebars

...

This commit is contained in:

Laurent Lepinay

2015-07-07 15:31:21 +02:00

parent 92efe421d0 59459a6086

commit d968fda207

50 changed files with 13078 additions and 1525 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

12947

dist/swagger-ui.js vendored

File diff suppressed because one or more lines are too long