MAM/VPR-Frontend
3
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
139 Commits 22 Branches 0 Tags 2.1 MiB
Java 84.8%
CSS 12.9%
Kotlin 2.3%
4c94cadf11
Go to file
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
client Merge branch 'merge' into Comments 2022-02-07 10:40:53 +01:00
.gitignore Fixed gitignore 2022-01-24 13:44:48 +01:00
LICENSE Initial commit 2021-11-03 15:07:32 +01:00
README.md Initial commit 2021-11-03 15:07:32 +01:00

README.md

VPR-Frontend