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

..

client

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

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

config/petstore/apache2

Rename "swagger" to "openapi" (#191)

2018-04-22 21:28:17 +02:00

documentation/cwiki

Regenerate samples (#367)

2018-05-08 16:44:51 +08:00

dynamic-html

Rename default package for html, html2, dynamic-html (#350)

2018-05-07 09:55:23 +02:00

html

Regenerate samples (#367)

2018-05-08 16:44:51 +08:00

html2

Update Scala gatling's default value (#390)

2018-05-09 16:34:54 +08:00

html.md

Regenerate html.md OAS2 (#251)

2018-05-05 13:24:30 +02:00

meta-codegen

Cli generator name option, replaces 'language' options in CLI and Maven Plugin (#57)

2018-05-23 05:41:19 +02:00

openapi3/client/petstore/php

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

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

server

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

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

yaml

Spelling fixes

2016-08-27 02:34:33 +03:00