tree e4951dca0d2a8823a055392c470c72e8925947d1
parent 5f356268a8317e2f06825859f8ada5a7aa4343f9
parent 41f06a23c2f03f5b3ea6dc3d3b6e6d1152c4bb2e
author Bodmo <Bodmer@ids-mannheim.de> 1702980964 +0100
committer Bodmo <Bodmer@ids-mannheim.de> 1702980964 +0100

Merge branch 'opPROX' of ssh://korap.ids-mannheim.de:29418/KorAP/Koral into opPROX

Change-Id: If67765481972fb81db29c496bf39e01cfcc78fef