Arnaud Vergnet dd38c059a7 Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/main/java/fr/insa/clavardator/FXMLController.java		2020-11-27 12:00:38 +01:00
..
fr/insa/clavardator	Merge remote-tracking branch 'origin/master'	2020-11-27 12:00:38 +01:00