Benjamin Feyer dd836aa6b9 Merge remote-tracking branch 'origin/development' into dev/test ...

# Conflicts:
#	Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java

2024-11-28 18:44:47 +01:00

..

client

added mor client state transitions

2024-11-28 18:28:55 +01:00

model

Merge remote-tracking branch 'origin/development' into dev/test

2024-11-28 18:44:47 +01:00