# Conflicts: # client/app/src/main/java/main/CreateEventController.java
Merge remote-tracking branch 'origin/Update-components-to-JFoenix' into Update-components-to-JFoenix
VPR-Frontend
Description
Languages
Java
84.8%
CSS
12.9%
Kotlin
2.3%