Commit b3b59407 authored by DELBECQ Théo's avatar DELBECQ Théo

Merge branch 'master' into 'Theo'

# Conflicts:
#   build/built-jar.properties
parents d473c883 b7755baf
#Mon, 04 May 2020 22:08:40 +0200
#Mon, 04 May 2020 20:15:39 +0200
C\:\\Users\\theo\\Documents\\Ecole\\IMT\ Lille\ Douai\\L3\\Projet\ Info\\groupe3-tictactoe=
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment