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

Browse Source

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

...

This commit is contained in:

Laurent Lepinay

2015-11-13 13:42:46 +01:00

parent 57055ffc18 257db60a0b

commit 51b7b1db39

14 changed files with 1213 additions and 900 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

239

dist/swagger-ui.js vendored

File diff suppressed because one or more lines are too long