Clone
Alex Saveau <saveau.alexandre@gmail.com>
committed
on 31 Aug 18
Merge branch 'master' into input-files
# Conflicts:
# subprojects/core/src/main/java/org/gradle/api/internal/tasks/DefaultPropertySpecFactor… Show more
Merge branch 'master' into input-files

# Conflicts:

#       subprojects/core/src/main/java/org/gradle/api/internal/tasks/DefaultPropertySpecFactory.java

#       subprojects/core/src/main/java/org/gradle/api/internal/tasks/DefaultTaskInputs.java

#       subprojects/core/src/main/java/org/gradle/api/internal/tasks/PropertySpecFactory.java

#       subprojects/core/src/main/java/org/gradle/api/internal/tasks/ValidationActions.java

#       subprojects/core/src/main/java/org/gradle/api/internal/tasks/properties/annotations/InputFilesPropertyAnnotationHandler.java

Show less

master + 391 more