Merge remote-tracking branch 'SwaggerOfficial/develop_2.0' into JSONEditor

Browse Source

Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	package.json

...

This commit is contained in:

laurent lepinay

2015-04-07 05:20:02 -07:00

parent 155b450e01 1ea77868aa

commit 801acf07e3

11 changed files with 19467 additions and 34 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

19435

dist/swagger-ui.js vendored

File diff suppressed because one or more lines are too long