Ole Lensmar 19de558f4a Merge branches 'develop_2.0' and 'jaxrs-interface-generation' of https://github.com/swagger-api/swagger-codegen into jaxrs-interface-generation ...

Conflicts:
	modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java

2015-05-20 22:51:49 -06:00

..

src

Merge branches 'develop_2.0' and 'jaxrs-interface-generation' of https://github.com/swagger-api/swagger-codegen into jaxrs-interface-generation

2015-05-20 22:51:49 -06:00

pom.xml

added excludes for logback.xml per https://github.com/swagger-api/swagger-codegen/issues/689

2015-04-27 22:51:52 -07:00