VPR-Frontend/client/app
Alex Rechtin 4c94cadf11 Merge branch 'merge' into Comments
# Conflicts:
#	client/app/src/main/java/customUI/Button.java
#	client/app/src/main/java/customUI/Converter.java
#	client/app/src/main/java/customUI/Label.java
#	client/app/src/main/java/customUI/Tooltip.java
#	client/app/src/main/java/events/EditEventController.java
#	client/app/src/main/java/helper/SvgBtnCreator.java
#	client/app/src/main/java/main/MainController.java
#	client/data/src/main/java/container/Event.java
#	client/data/src/main/java/res/DataController.java
#	client/data/src/main/java/res/HttpRequest.java
2022-02-07 10:40:53 +01:00
..
src/main Merge branch 'merge' into Comments 2022-02-07 10:40:53 +01:00
build.gradle.kts Changed encoding to utf-8 2022-01-29 10:06:28 +01:00