Alex Rechtin 3f41005d84 Merge branch 'merge' into 1800-UI-User-bearbeiten ...

# Conflicts:
#	client/app/src/main/java/users/EditUserController.java
#	client/app/src/main/resources/users/edit-user.fxml

2022-01-31 12:40:03 +01:00

..

app

Merge branch 'merge' into 1800-UI-User-bearbeiten

2022-01-31 12:40:03 +01:00

data

Save login

2022-01-29 20:15:20 +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