Juergen Hoeller 10610a6f54 Merge branch '6.0.x' ...

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

2023-08-02 01:42:27 +02:00

..

framework-platform.gradle

…