521b1cb2f72f3d3d074ff7b1e8a85a63f1f64f61
# 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%