Merge remote-tracking branch 'upstream/master' into gradle-java

# Conflicts:
#	.github/workflows/deploy.yml
#	.github/workflows/maven.yml
#	pom.xml
This commit is contained in:
AlexProgrammerDE 2023-12-16 16:13:53 +01:00
commit 4499e93822

Diff content is not available