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

Merge remote-tracking branch 'origin/master' into hugo-desmons

# Conflicts:
#	src/main/java/fr/univlille/sae/classification/controller/DataVisualizationController.java
#	src/main/java/fr/univlille/sae/classification/utils/ViewUtil.java
#	src/main/java/fr/univlille/sae/classification/view/DataStageView.java
#	src/main/java/fr/univlille/sae/classification/view/MainStageView.java
parents 08d9b972 3611137d
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment