Laurent Lepinay 1367e8f6fa Merge remote-tracking branch 'upstream/master' into JSONEditorMaster ...

Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	test/e2e/v2.js

2015-09-21 14:48:29 +02:00

..

driver.js

JSHintify test

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

servers.js

updated timeouts

2015-09-19 11:36:40 -07:00

v1.js

Update v1.js

2015-09-19 10:39:16 -07:00

v2.js

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

2015-09-21 14:48:29 +02:00