Marcel Lengl 663c79c6d2 Merge branch 'master' of https://github.com/Taskana/taskana into TSK-61		2017-12-08 15:12:38 +01:00
..
java/pro/taskana	Merge branch 'master' of https://github.com/Taskana/taskana into TSK-61	2017-12-08 15:12:38 +01:00
resources	Merge branch 'master' of https://github.com/Taskana/taskana into TSK-43	2017-11-30 11:31:02 +01:00