Commit Graph

5 Commits

Author SHA1 Message Date
laurent lepinay
801acf07e3 Merge remote-tracking branch 'SwaggerOfficial/develop_2.0' into JSONEditor
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	package.json
2015-04-07 05:20:02 -07:00
Tony Tam
e214e7a0a2 updated links 2015-03-27 18:51:26 -07:00
laurent lepinay
bfca6020d2 e2e test for jsoneditor 2015-03-11 05:37:14 -07:00
Tony Tam
75bb7e2521 added tags to test 2015-02-19 22:00:17 -08:00
Tony Tam
89cb34ed1d moved tests, added 1.x, 2.0 2015-01-30 22:49:36 -08:00