xhh af2ec4cf85 Merge branch 'develop_2.0' into library-template-jersey2 ... Conflicts: modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java modules/swagger-codegen/src/main/resources/Java/api.mustache		2015-08-20 17:36:42 +08:00
..
client	Merge branch 'develop_2.0' into library-template-jersey2	2015-08-20 17:36:42 +08:00
dynamic-html	updated versions	2015-06-09 00:25:09 -07:00
html	updated versions	2015-06-09 00:25:09 -07:00
server/petstore	Merge pull request #966 from wing328/nodejs_fix_summary	2015-07-20 11:12:15 +08:00
server-generator	Code reformatting	2015-06-07 11:56:08 -04:00
yaml	url changes	2015-06-07 11:46:11 -04:00