Clone
Fran├žois Guillot
committed
on 03 Oct 18
Merge branch 'release'
# Conflicts:
# settings.gradle.kts
# subprojects/build-init/build-init.gradle
# subprojects/performance/src/performan… Show more
Merge branch 'release'

# Conflicts:

#       settings.gradle.kts

#       subprojects/build-init/build-init.gradle

#       subprojects/performance/src/performanceTest/groovy/org/gradle/performance/regression/java/JavaFirstUsePerformanceTest.groovy

Show less

master + 448 more