Jeremie Bresson b0c02d8ea6 Merge remote-tracking branch 'origin/3.1.x' into 4.0.x ...

# Conflicts:
#	samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
#	samples/server/petstore/kotlin-server/ktor/README.md
#	samples/server/petstore/php-silex/.openapi-generator/VERSION

2018-06-25 19:09:41 +02:00

..

Api

Merge remote-tracking branch 'origin/3.1.x' into 4.0.x

2018-06-25 19:09:41 +02:00

Model

Prepare 3.0.3-SNAPSHOT (#338)

2018-06-18 09:32:11 +02:00

ApiException.php

Prepare 3.0.3-SNAPSHOT (#338)

2018-06-18 09:32:11 +02:00

Configuration.php

Prepare 3.0.3-SNAPSHOT (#338)

2018-06-18 09:32:11 +02:00

HeaderSelector.php

Prepare 3.0.3-SNAPSHOT (#338)

2018-06-18 09:32:11 +02:00

ObjectSerializer.php

Merge remote-tracking branch 'origin/3.1.x' into 4.0.x

2018-06-25 19:09:41 +02:00