tree b835812820afa279553c39fbad2d93453e8e44f4
parent e00f875ba3b22ba50bb62aa2205aeeb23c67728e
parent b57f29129ad10b336f70cf52e275ae7c88178259
author Eliza Margaretha <margaretha@ids-mannheim.de> 1465486578 +0200
committer Eliza Margaretha <margaretha@ids-mannheim.de> 1465486585 +0200

Merge branch 'fcs-ql' of
ssh://margaretha@korap.ids-mannheim.de:29418/KorAP/Koral into fcs-ql

Conflicts:
	src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java

Change-Id: Id1037d133c9fa6ea7cb4e07f0ae32ed978671c18