wing328 d0529cffdb Merge branch 'php-fix-array-handling-2' of https://github.com/arnested/swagger-codegen into arnested-php-fix-array-handling-2 ... Conflicts: modules/swagger-codegen/src/main/resources/php/model.mustache samples/client/petstore/php/SwaggerClient-php/README.md samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php samples/client/petstore/php/SwaggerClient-php/lib/Model/AnimalFarm.php samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumClass.php samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php		2016-05-10 00:29:13 +08:00
..
src	Merge branch 'php-fix-array-handling-2' of https://github.com/arnested/swagger-codegen into arnested-php-fix-array-handling-2	2016-05-10 00:29:13 +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	fix double byte characters in description, upgrade to lang3	2016-05-06 16:36:45 +08:00