tree a65be0bd31960e10110903e04175f480219abee4
parent 26674c9034cff974abe91acf6287f7cc3dcce31c
parent ce0646fff25d6acce82cfcbe45dca2bf53269a63
author Peter Klügl <peter.kluegl@averbis.com> 1602756450 +0200
committer Peter Klügl <peter.kluegl@averbis.com> 1602756450 +0200

Merge branch 'master' into UIMA-6271-validate-internal-ruta-indexing

# Conflicts:
#	ruta-parent/pom.xml