Merge branch 'JSONEditor' into JSONEditorMaster

Browse Source

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

...

This commit is contained in:

unknown

2015-09-10 10:53:15 +02:00

parent 736e7cd90e 3128da0446

commit ea2cefa46e

49 changed files with 2904 additions and 2546 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

11

dist/lib/jsoneditor.min.js vendored Normal file

File diff suppressed because one or more lines are too long