Laurent Lepinay d968fda207 Merge remote-tracking branch 'swagger/develop_2.0' into JSONEditorMerge ...

Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/html/index.html
	src/main/template/param.handlebars
	src/main/template/param_required.handlebars

2015-07-07 15:31:21 +02:00

..

v1.2/petstore

Updated ToS

2015-06-04 15:15:44 -04:00

v2

Merge remote-tracking branch 'swagger/develop_2.0' into JSONEditorMerge

2015-07-07 15:31:21 +02:00