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

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

2024-04-29 18:05:40 +02:00

..

framework-platform.gradle

Merge branch '6.1.x'

2024-04-29 18:05:40 +02:00