Clone
Luke Daley
committed
on 01 Sep
Merge remote-tracking branch 'origin/master' into ldaley/settings-before-buildsrc
# Conflicts:
# subprojects/core/src/integTest/groovy/org/g… Show more
Merge remote-tracking branch 'origin/master' into ldaley/settings-before-buildsrc

# Conflicts:

#       subprojects/core/src/integTest/groovy/org/gradle/initialization/buildsrc/BuildSrcDeprecatedInSettingsIntegrationTest.groovy

#       subprojects/core/src/main/java/org/gradle/api/internal/initialization/DefaultDeprecatedClassLoader.java

#       subprojects/core/src/main/java/org/gradle/api/internal/initialization/DeprecatedClassLoaderScope.java

Show less