tree 7ae97c42193864baac8e30b081a7b1717bd8a42f
parent accfec3dd26536788940d0d49935d9ef4b627062
parent 87da060c8b451c9c92a22f9d09310f4396eaaf98
author Peter Klügl <peter.kluegl@averbis.com> 1620388822 +0200
committer Peter Klügl <peter.kluegl@averbis.com> 1620388822 +0200

Merge branch 'main' into feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0

# Conflicts:
#	ruta-parent/pom.xml