Peter S. May 1072c9d017 Merge remote-tracking branch 'upstream/develop_2.0' into develop_2.0-RestSharp-path-params ...

Conflicts:
	modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
	modules/swagger-codegen/src/main/resources/csharp/api.mustache

2015-07-17 21:45:54 -04:00

..

src

Merge remote-tracking branch 'upstream/develop_2.0' into develop_2.0-RestSharp-path-params

2015-07-17 21:45:54 -04:00

pom.xml

updated dev version

2015-06-09 01:36:52 -07:00