Marc Beyer
646da71e8a
Merge branch '2410-develop' into merge
# Conflicts: # client/app/src/main/java/main/MainController.java
VPR-Frontend
Description
Languages
Java
84.8%
CSS
12.9%
Kotlin
2.3%