xhh 622b5c179a Merge remote-tracking branch 'origin/develop_2.0' into java-accept-contenttype ...

Conflicts:
	modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
	modules/swagger-codegen/src/main/resources/Java/api.mustache
	samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java

2015-06-05 16:31:21 +08:00

..

api.mustache

Merge remote-tracking branch 'origin/develop_2.0' into java-accept-contenttype

2015-06-05 16:31:21 +08:00

ApiClient.mustache

Merge remote-tracking branch 'origin/develop_2.0' into java-accept-contenttype

2015-06-05 16:31:21 +08:00

apiException.mustache

Add comments to code

2015-06-03 10:09:36 +08:00

Configuration.mustache

Add comments to code

2015-06-03 10:09:36 +08:00

JsonUtil.mustache

moved to modules per #411

2015-02-05 07:17:38 -08:00

model.mustache

fixed required flag

2015-03-31 16:07:24 -07:00

pom.mustache

updated versions

2015-03-26 23:17:17 -07:00

StringUtil.mustache

Add comments to string utility methods

2015-05-25 16:01:57 +08:00