Felix 3465cdaa19 Merge branch 'view_assets' into dev_client ...

# Conflicts:
#	Projekte/mdga/client/build.gradle

2024-11-13 17:21:24 +01:00

..

client

Merge branch 'view_assets' into dev_client

2024-11-13 17:21:24 +01:00

model

fixed gradle build

2024-11-12 17:41:20 +01:00