tree 5c8d8312d4e6f71dd20cee0f113e02e4e3be8c75
parent 0caa77f3e21e9738b2ea3f817fda9ffb2433b5ad
parent add5e8b9bcff682e72fbf5d3e26ae7d30afbb5ac
author David Matějček <dmatej@seznam.cz> 1644779376 +0100
committer David Matějček <dmatej@seznam.cz> 1644782731 +0100

Merge commit 'add5e8b9bc' into sync-6.x-to-master220213

# Conflicts: easy
#	appserver/admingui/devtests/hudson.xml
#	appserver/admingui/devtests/pom.xml
#	appserver/admingui/devtests/run_test.sh
#	appserver/pom.xml
#	nucleus/parent/pom.xml

Signed-off-by: David Matějček <dmatej@seznam.cz>