tree 44436734eeed0ae25b445094b2355c9b88d57f50
parent 59b905f1ea698d42a3c1180d5c8000c2c6fbec70
parent d3e077f840c403c650e6f3fe903454288c665ce4
author margaretha <margaretha@ids-mannheim.de> 1504608443 +0200
committer margaretha <margaretha@ids-mannheim.de> 1504608443 +0200

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