Merge remote-tracking branch 'origin/5.3.x' into 6.0.x

This commit is contained in:
William Cheng
2021-07-12 17:11:35 +08:00
3874 changed files with 120282 additions and 21640 deletions

View File

@@ -40,7 +40,7 @@ docs/EnumTest.md
docs/EquilateralTriangle.md
docs/FakeApi.md
docs/FakeClassnameTags123Api.md
docs/FakeGetInlineAdditionalPropertiesPayloadArrayData.md
docs/FakePostInlineAdditionalPropertiesPayloadArrayData.md
docs/File.md
docs/FileSchemaTestClass.md
docs/Foo.md
@@ -150,7 +150,7 @@ petstore_api/model/enum_arrays.py
petstore_api/model/enum_class.py
petstore_api/model/enum_test.py
petstore_api/model/equilateral_triangle.py
petstore_api/model/fake_get_inline_additional_properties_payload_array_data.py
petstore_api/model/fake_post_inline_additional_properties_payload_array_data.py
petstore_api/model/file.py
petstore_api/model/file_schema_test_class.py
petstore_api/model/foo.py

View File

@@ -1 +1,5 @@
6.0.0-SNAPSHOT
<<<<<<< HEAD
6.0.0-SNAPSHOT
=======
5.3.0-SNAPSHOT
>>>>>>> origin/5.3.x