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

This commit is contained in:
William Cheng
2019-06-03 00:06:43 +08:00
1959 changed files with 24161 additions and 4878 deletions

View File

@@ -5,7 +5,11 @@
<parent>
<artifactId>openapi-generator-project</artifactId>
<groupId>org.openapitools</groupId>
<<<<<<< HEAD
<version>4.1.0-SNAPSHOT</version>
=======
<version>4.0.2-SNAPSHOT</version>
>>>>>>> origin/master
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>