tree 36c9f75f36e72b50856efaf638f94e7685df9e9d
parent 36b46fa61e0180415b513ed78070f63dc324dcf2
parent 630ec068c58daeb45842cd8acaafca5cc2c3fd8c
author Peter Klügl <peter.kluegl@averbis.com> 1607080992 +0100
committer Peter Klügl <peter.kluegl@averbis.com> 1607080992 +0100

Merge remote-tracking branch 'origin/main' into UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views

# Conflicts:
#	ruta-parent/pom.xml