tree 85e318cd5d541c369bfbc9f90ac5f1166f7931d5
parent 226ec1ee956afa0dbd6d7d2d90632922abf6cf9d
parent d50581633780bc5edb7b07027408e22ca4d06557
author margaretha <margaretha@ids-mannheim.de> 1530802935 +0200
committer margaretha <margaretha@ids-mannheim.de> 1530802935 +0200

Merge branch 'master' of
ssh://margaretha@korap.ids-mannheim.de:29418/KorAP/Kustvakt into dev

Conflicts:
	full/Changes

Change-Id: Ic5ab9aef5c68805e5ac84db97050af004172592a