openapi-generator/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient
wing328 2ab315fa6f Merge branch 'csharp_default_paths' of https://github.com/jimschubert/swagger-codegen into jimschubert-csharp_default_paths
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
	samples/client/petstore/csharp/SwaggerClient/README.md
	samples/client/petstore/csharp/SwaggerClient/docs/FormatTest.md
	samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/FormatTest.cs
	samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/InlineResponse200.cs
	samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj
	samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
	samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt
2016-05-07 17:30:40 +08:00
..
docs Merge branch 'csharp_default_paths' of https://github.com/jimschubert/swagger-codegen into jimschubert-csharp_default_paths 2016-05-07 17:30:40 +08:00
src/main/csharp/IO/Swagger Merge branch 'csharp_default_paths' of https://github.com/jimschubert/swagger-codegen into jimschubert-csharp_default_paths 2016-05-07 17:30:40 +08:00