Commit Graph

5 Commits

Author SHA1 Message Date
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
geekerzp
e6d7517e63 Update api-body.mustache, api-header.mustache,
apiBodyResponseWithContainer.mustache and apiNonPrimitiveResponse.mustache
templates in objective-c client.

* Update `asDictionary` method to `toDictionary` method which provided by
  JSONModel.
* Update `initWithValues` method to `initWithDictionary` method which
  provided by JSONModel.
2015-03-29 18:06:52 +08:00
Tony Tam
99271e77ab added multi-param args 2015-03-27 22:55:06 -07:00
Tony Tam
eb9e95952d updated templates 2015-02-06 05:48:47 -08:00
Tony Tam
6bb2e4ccb4 moved to modules per #411 2015-02-05 07:17:38 -08:00