Skip to content

Commit

Permalink
Merge branch '2.5.x'
Browse files Browse the repository at this point in the history
Closes gh-27088
  • Loading branch information
philwebb committed Jun 24, 2021
2 parents e676099 + 8f9652c commit 674b9fb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 674b9fb

Please sign in to comment.