laurent lepinay 326f542d04 Merge branch 'develop_2.0' into JSONEditor ...

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

2015-03-27 02:15:29 -07:00

..

driver.js

JSHintify test

2015-03-12 17:01:01 -07:00

servers.js

JSHintify test

2015-03-12 17:01:01 -07:00

v1.js

xit out tests that are failing due to SwaggerJS

2015-03-25 15:23:49 -07:00

v2.js

Merge branch 'develop_2.0' into JSONEditor

2015-03-24 07:06:07 -07:00