Skip to content
Snippets Groups Projects
Commit 93d930ae authored by Janis Daniel Dähne's avatar Janis Daniel Dähne
Browse files

Merge branch 'develop' of gitlab.informatik.uni-halle.de:Syndrom/ClientServer into develop

# Conflicts:
#	src/ClientServer/Config/Constants.cs
parents b8ca07d4 81314bbb
Branches
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment