Merge branch 'release/3.x'
# Conflicts: # CHANGELOG.md # VERSION # ktor-server/ktor-server-cio/common/src/io/ktor/server/cio/backend/ServerPipeline.kt # ktor-server/ktor-server-core/common/src/io/ktor/server/application/ApplicationCallPipeline.kt # ktor-server/ktor-server-core/common/src/io/ktor/server/application/PluginBuilder.kt # ktor-server/ktor-server-core/jvm/src/io/ktor/server/engine/DefaultTransformJvm.kt # ktor-server/ktor-server-core/jvm/src/io/ktor/server/engine/EmbeddedServerJvm.kt # ktor-server/ktor-server-core/jvm/src/io/ktor/server/http/content/StaticContent.kt # ktor-server/ktor-server-core/nonJvm/src/io/ktor/server/engine/DefaultTransform.nonJvm.kt # ktor-server/ktor-server-core/web/src/io/ktor/server/engine/DefaultTransform.web.kt # ktor-server/ktor-server-plugins/ktor-server-auth/common/src/io/ktor/server/auth/AuthenticationInterceptors.kt # ktor-server/ktor-server-plugins/ktor-server-auth/common/src/io/ktor/server/auth/OAuthProcedure.kt # ktor-server/ktor-server-plugins/ktor-server-body-limit/common/src/io/ktor/server/plugins/bodylimit/RequestBodyLimit.kt # ktor-server/ktor-server-plugins/ktor-server-cors/common/src/io/ktor/server/plugins/cors/CORS.kt # ktor-server/ktor-server-plugins/ktor-server-openapi/jvm/test/io/ktor/server/plugins/openapi/OpenAPITest.kt # ktor-server/ktor-server-plugins/ktor-server-rate-limit/common/src/io/ktor/server/plugins/ratelimit/RateLimitInterceptors.kt
O
Osip Fatkullin committed
39c7ae0769b5a1fc8008cc0f2ec0a5573d0d2902