PBS2H20ARE 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

..

src/main

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

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

build.gradle.kts

Changed encoding to utf-8

2022-01-29 10:06:28 +01:00