Skip to content
Snippets Groups Projects
Commit 6b444d01 authored by Matias Mennecart's avatar Matias Mennecart
Browse files

Merge remote-tracking branch 'origin/hugodebuyser' into hugodebuyser 

# Conflicts:
#	src/main/java/fr/univlille/sae/classification/controller/MainStageController.java
parents 4c748099 a89e2f10
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment