tree e3a47431e287de314b032bbeed9e5ca664ccf4e0
parent d7fda43105f5538bba025c9410ce599758f22584
parent 9ca9ba3b70b8a7b41273c96b3ba378e336a942e9
author Eliza Margaretha <margaretha@ids-mannheim.de> 1478270854 +0100
committer Eliza Margaretha <margaretha@ids-mannheim.de> 1478270854 +0100

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

Conflicts:
	.gitignore
	pom.xml