Skip to content
Snippets Groups Projects
Commit fdefb176 authored by Hugo Debuyser's avatar Hugo Debuyser
Browse files

Merge branch 'master' into 'matissedekeiser'

# Conflicts:
#   src/main/java/fr/univlille/sae/classification/view/AddDataView.java
parents 124ce155 e04bc360
Branches
Tags
No related merge requests found
Showing
with 387 additions and 291 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment