tree 218e97d42d2a5a51dc20b295e841e856e10b520a
parent 611adfbfaf2a7b2c1b5e97943652ccc43700b28a
parent 0664faeeeabcdc8a90eeada94c69d5ca90c55b1d
author David Matějček <dmatej@seznam.cz> 1643566990 +0100
committer David Matějček <dmatej@seznam.cz> 1643566990 +0100

Merge remote-tracking branch 'eclipse/6.x' into sync-6.x-to-master220130

# Conflicts: - easy
#	Jenkinsfile
#	appserver/extras/javaee/manifest-jar/pom.xml
#	appserver/pom.xml