xhh ee1f401145 Merge branch 'master' into java-imports ...

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java

2016-01-29 11:16:14 +08:00

..

src

Merge branch 'master' into java-imports

2016-01-29 11:16:14 +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