Zellweger Christof Ralf 67b5c6cec4 Merge branch 'master' into ATEST-472 ...

Conflicts:
	src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java

2016-07-06 10:27:02 +02:00

..

java/ch/psi/daq/queryrest

Merge branch 'master' into ATEST-472

2016-07-06 10:27:02 +02:00

resources

ATEST-344

2016-07-05 09:40:14 +02:00