xhh 4d25d264c4 Merge remote-tracking branch 'origin/develop_2.0' into java-auth ...

Conflicts:
	modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache
	samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java

2015-05-29 10:08:50 +08:00

..

src

Merge remote-tracking branch 'origin/develop_2.0' into java-auth

2015-05-29 10:08:50 +08:00

pom.xml

merged

2015-05-20 21:48:03 -07:00