Merge remote-tracking branch 'german/master' into merge
Conflicts: daemon/src/main/java/org/openslx/taskmanager/App.java
Showing
+236 -123
Please register or sign in to comment
Conflicts: daemon/src/main/java/org/openslx/taskmanager/App.java