Juergen Hoeller dc6c96de0a Merge branch '6.1.x' ... # Conflicts: # spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java # spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java # spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java		2024-03-04 22:50:22 +01:00
..
src	Merge branch '6.1.x'	2024-03-04 22:50:22 +01:00
spring-web.gradle	Add ThreadLocalAccessor for LocaleContext and RequestAttributes	2024-02-15 15:49:55 +01:00