mirror of
https://github.com/spring-projects/spring-framework
synced 2026-06-08 17:33:33 +00:00
3804b1c602
# Conflicts: # spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java # spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java # spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/R2dbcTransactionManagerUnitTests.java