Merge branch '6.1.x'
# Conflicts: # framework-docs/modules/ROOT/pages/core/beans/definition.adoc # framework-platform/framework-platform.gradle # spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
This commit is contained in:
commit
e43e659983
|
@ -1,2 +1,2 @@
|
|||
org.gradle.caching=true
|
||||
javaFormatVersion=0.0.41
|
||||
javaFormatVersion=0.0.42
|
||||
|
|
Loading…
Reference in New Issue