wing328 2d5cc50bd1 Merge branch 'master' of https://github.com/demonfiddler/swagger-codegen into demonfiddler-master ...

Conflicts:
	samples/client/petstore/javascript-promise/README.md
	samples/client/petstore/javascript-promise/docs/PetApi.md
	samples/client/petstore/javascript-promise/docs/StoreApi.md
	samples/client/petstore/javascript-promise/src/api/PetApi.js
	samples/client/petstore/javascript-promise/src/index.js
	samples/client/petstore/javascript/README.md
	samples/client/petstore/javascript/docs/PetApi.md
	samples/client/petstore/javascript/docs/StoreApi.md
	samples/client/petstore/javascript/src/api/PetApi.js
	samples/client/petstore/javascript/src/index.js

2016-05-01 12:05:49 +08:00

..

src

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

2016-05-01 12:05:49 +08:00

XhhGitIgnore

Revert "Revert "[Java] Add auto-generated documentation in Markdown to Java clients""

2016-04-22 10:13:54 +08:00

.gitignore

Ignore settings #1294

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

pom.xml

Revert: #1809 changing the poms

2016-04-19 11:57:55 +02:00