Skip to content
Snippets Groups Projects
Commit d61df947 authored by Egon Nathan Bittencourt Araujo's avatar Egon Nathan Bittencourt Araujo
Browse files

Merge remote-tracking branch 'german/master' into merge

Conflicts:
	daemon/src/main/java/org/openslx/taskmanager/App.java
parents 8fbf952b 7cb0f7c2
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment