VPR-Frontend/client/app
Marco Kühn 4aafae9896 Merge branch 'option-ui' into merge
# Conflicts:
#	client/data/src/main/java/res/DataController.java
2022-01-26 13:26:15 +01:00
..
src/main Merge branch 'option-ui' into merge 2022-01-26 13:26:15 +01:00
build.gradle.kts Fixed main class 2022-01-25 19:18:38 +01:00