MAM/VPR-Frontend
3
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4aafae9896
VPR-Frontend/client
History
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
..
app Merge branch 'option-ui' into merge 2022-01-26 13:26:15 +01:00
data Merge branch 'option-ui' into merge 2022-01-26 13:26:15 +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