Guo Huang 7fda8699b1 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen into issue2535 ...

# Conflicts:
#	modules/swagger-codegen/src/main/resources/go/configuration.mustache
#	samples/client/petstore/go/swagger/Configuration.go

2016-04-11 20:17:57 -07:00

..

src

Merge branch 'master' of https://github.com/swagger-api/swagger-codegen into issue2535

2016-04-11 20:17:57 -07:00

.gitignore

Ignore settings #1294

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

pom.xml

release prepare

2016-04-06 14:07:52 -07:00