Juergen Hoeller a26d31ee3a Merge branch '6.1.x' ...

# Conflicts:
#	framework-platform/framework-platform.gradle

2024-06-05 00:02:33 +02:00

..

framework-platform.gradle

Merge branch '6.1.x'

2024-06-05 00:02:33 +02:00