An error occurred while fetching folder content.
Merge remote-tracking branch 'german/master' into merge
Egon Nathan Bittencourt Araujo authored
Conflicts:
	daemon/src/main/java/org/openslx/taskmanager/App.java
d61df947
Name Last commit Last update