openapi-generator/samples/client
xhh 35079fedef Merge branch 'master' into java-reserved-operation-id
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
2016-02-26 11:34:47 +08:00
..
petstore Merge branch 'master' into java-reserved-operation-id 2016-02-26 11:34:47 +08:00