Felix Koppe c2cfd8c175 Merge remote-tracking branch 'origin/dev/client_beck' into dev/client_beck ...

# Conflicts:
#	Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
#	Projekte/mdga/model/src/main/java/pp.mdga/server/Lobby.java

2024-11-30 12:48:49 +01:00

..

client

Merge remote-tracking branch 'origin/dev/client_beck' into dev/client_beck

2024-11-30 12:48:49 +01:00

model

Merge branch 'refs/heads/development' into dev/client_beck

2024-11-30 12:44:04 +01:00