Jeremie Bresson 00246f3ea0 Merge remote-tracking branch 'origin/master' into 3.2.x ...

* Solve Conflicts
* Activate "ensure_up_to_date" script
* Remove references to the "3.2.x" branch

# Conflicts:
#	CI/pom.xml.bash
#	CI/pom.xml.circleci
#	CI/pom.xml.circleci.java7
#	CI/pom.xml.ios
#	modules/openapi-generator-cli/pom.xml
#	modules/openapi-generator-gradle-plugin/gradle.properties
#	modules/openapi-generator-gradle-plugin/pom.xml
#	modules/openapi-generator-maven-plugin/pom.xml
#	modules/openapi-generator-online/Dockerfile
#	modules/openapi-generator-online/pom.xml
#	modules/openapi-generator/pom.xml
#	pom.xml

2018-07-25 18:19:37 +02:00

..

openapi-generator

Release 3.1.2 (#647)

2018-07-25 18:09:52 +02:00

openapi-generator-cli

Release 3.1.2 (#647)

2018-07-25 18:09:52 +02:00

openapi-generator-gradle-plugin

Merge remote-tracking branch 'origin/master' into 3.2.x

2018-07-25 18:19:37 +02:00

openapi-generator-maven-plugin

Merge remote-tracking branch 'origin/master' into 3.2.x

2018-07-25 18:19:37 +02:00

openapi-generator-online

Release 3.1.2 (#647)

2018-07-25 18:09:52 +02:00