Merge branch 'develop_2.0' into JSONEditor

Browse Source

Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js

...

This commit is contained in:

laurent lepinay

2015-03-27 02:15:29 -07:00

parent e7b7465335 311abe7fea

commit 326f542d04

23 changed files with 162 additions and 37839 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

4

dist/swagger-ui.min.js vendored

File diff suppressed because one or more lines are too long