Marc Beyer 7aa615ce54 Merge branch '2410-develop' into merge ...

# Conflicts:
#	client/app/src/main/java/main/MainController.java

2022-01-23 21:33:42 +01:00

..

app

Merge branch '2410-develop' into merge

2022-01-23 21:33:42 +01:00

data

Added save login

2022-01-23 21:21:16 +01:00

gradle/wrapper

renamed projekt folder and package file

2021-11-29 15:44:55 +01:00

build.gradle.kts

renamed projekt folder and package file

2021-11-29 15:44:55 +01:00

gradlew

renamed projekt folder and package file

2021-11-29 15:44:55 +01:00

gradlew.bat

renamed projekt folder and package file

2021-11-29 15:44:55 +01:00

settings.gradle.kts

renamed projekt folder and package file

2021-11-29 15:44:55 +01:00