Marcel Lengl f166b648ce TSK-21: Conflicts resolved (merge)		2017-11-30 14:03:01 +01:00
..
java/pro/taskana	Checked /tasks/id request, updated unitTest for TaskService and made ServiceCalls better Testable.	2017-11-29 13:20:14 +01:00
resources	Merge branch 'master' of https://github.com/Taskana/taskana into TSK-43	2017-11-30 11:31:02 +01:00