Commit 674b9fb8 authored by Phillip Webb's avatar Phillip Webb

Merge branch '2.5.x'

Closes gh-27088
parents e6760995 8f9652c0
......@@ -4,7 +4,7 @@ org.gradle.caching=true
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
kotlinVersion=1.5.10
tomcatVersion=9.0.46
kotlinVersion=1.5.20
tomcatVersion=9.0.48
kotlin.stdlib.default.dependency=false
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment