Merge branch 'develop_2.0' of github.com:swagger-api/swagger-codegen into develop_2.0

2015-05-23 08:48:40 -07:00
parent 98d5dd727b f4aee62fb4
commit d83a275b6e
3 changed files with 11 additions and 4 deletions
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java
@@ -83,6 +83,7 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
    typeMapping.put("file", "string"); // path to file
    typeMapping.put("array", "List");
    typeMapping.put("map", "Dictionary");
+    typeMapping.put("object", "Object");

  }