wing328 a0b429d690 Merge branch 'issue2374' of https://github.com/kolyjjj/swagger-codegen into kolyjjj-issue2374 ... Conflicts: samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebApplication.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebMvcConfiguration.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ApiResponse.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java		2016-04-17 17:47:58 +08:00
..
client/petstore	Merge pull request #2608 from guohuang/issue2359	2016-04-17 16:14:59 +08:00
dynamic-html	add new fles	2016-04-16 18:19:23 +08:00
html	update sample for html, flash	2016-04-16 17:51:12 +08:00
server/petstore	Merge branch 'issue2374' of https://github.com/kolyjjj/swagger-codegen into kolyjjj-issue2374	2016-04-17 17:47:58 +08:00
server-generator	Swagger Spec -> OpenAPI Spec	2015-12-30 14:52:15 -08:00
yaml	url changes	2015-06-07 11:46:11 -04:00