Merge branch '2.3.x'

Closes gh-21667
This commit is contained in:
Andy Wilkinson 2020-06-03 10:36:26 +01:00
commit f0909aa18f

View File

@ -2,6 +2,6 @@ version=2.4.0-SNAPSHOT
org.gradle.caching=true
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2g
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
kotlinVersion=1.3.72