Juergen Hoeller 13221ac0ef Merge branch '6.1.x' ... # Conflicts: # spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java # spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java		2024-03-06 18:09:32 +01:00
..
src	Merge branch '6.1.x'	2024-03-06 18:09:32 +01:00
spring-tx.gradle	Consistent dependency declarations	2023-08-02 00:56:50 +02:00