Laurent Lepinay 57055ffc18 Merge remote-tracking branch 'upstream/master' into JSONEditorMaster ...

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

2015-10-29 10:48:42 +01:00

..

backbone-min.js

fixes

2015-07-07 14:55:04 +02:00

handlebars-2.0.0.js

fixes

2015-07-07 14:55:04 +02:00

highlight.7.3.pack.js

fixed jshint issues

2015-04-20 10:32:33 +02:00

jquery-1.8.0.min.js

fixed jshint issues

2015-04-20 10:32:33 +02:00

jquery.ba-bbq.min.js

fixes

2015-07-07 14:55:04 +02:00

jquery.slideto.min.js

fixes

2015-07-07 14:55:04 +02:00

jquery.wiggle.min.js

fixes

2015-07-07 14:55:04 +02:00

jsoneditor.min.js

fix jsoneditor render when nested object type is not defined

2015-09-21 15:11:50 +02:00

marked.js

fixes

2015-07-07 14:55:04 +02:00

swagger-oauth.js

rebuilt

2015-10-26 17:11:10 -07:00

underscore-min.js

fixes

2015-07-07 14:55:04 +02:00

underscore-min.map

fixed jshint issues

2015-04-20 10:32:33 +02:00