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

..

src

Merge branch 'master' into java-reserved-operation-id

2016-02-26 11:34:47 +08:00

.gitignore

Ignore settings #1294

2015-12-06 10:38:50 +01:00

pom.xml

New fix

2016-01-18 11:16:04 +01:00