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

Browse Source

Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/javascript/view/OperationView.js
	src/main/less/screen.less

...

This commit is contained in:

Laurent Lepinay

2015-12-16 10:25:38 +01:00

parent e051023288 63f6edeef0

commit 2c431d7873

32 changed files with 436 additions and 367 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

24

dist/swagger-ui.min.js vendored

File diff suppressed because one or more lines are too long