geekerzp 37118cab47 Merge branch 'develop_2.0' into develop_2.0_objc_jsonmodel ...

Conflicts:
	samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m

2015-03-29 18:15:02 +08:00

..

swagger-codegen

Merge branch 'develop_2.0' into develop_2.0_objc_jsonmodel

2015-03-29 18:15:02 +08:00

swagger-codegen-cli

update docs and bash about CLI usage, deprecate old cli classes

2015-03-28 12:34:44 +03:00

swagger-generator

adds tests, fixes for java templates

2015-03-26 20:32:59 -07:00