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

Browse Source

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

...

This commit is contained in:

Laurent Lepinay

2015-04-20 10:16:54 +02:00

parent 801acf07e3 82a89a7952

commit f3ee0a436c

49 changed files with 103 additions and 5198 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

1272

dist/lib/marked.js vendored

File diff suppressed because it is too large Load Diff