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
..
ISSUE_TEMPLATE.md	Fixes in GitHub templates files (#311)	2018-05-04 13:44:01 +02:00
PULL_REQUEST_TEMPLATE.md	Merge remote-tracking branch 'origin/master' into 3.2.x	2018-07-25 18:19:37 +02:00