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

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

# Conflicts:
#	src/main/java/fr/univlille/sae/classification/model/LoadableData.java
#	src/main/java/fr/univlille/sae/classification/model/Pokemon.java
parents 11b6aabf 1d5fe2bc
No related branches found
No related tags found
Show 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