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
..
swagger-codegen	Merge branch 'issue2374' of https://github.com/kolyjjj/swagger-codegen into kolyjjj-issue2374	2016-04-17 17:47:58 +08:00
swagger-codegen-cli	release prepare	2016-04-06 14:07:52 -07:00
swagger-codegen-maven-plugin	release prepare	2016-04-06 14:07:52 -07:00
swagger-generator	release prepare	2016-04-06 14:07:52 -07:00