Arnaud Vergnet 0e00cbb782 Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/main/java/fr/insa/clavardator/ui/MainController.java # src/main/java/fr/insa/clavardator/ui/users/UserListController.java		2020-12-05 17:52:21 +01:00
..
clavardator	Merge remote-tracking branch 'origin/master'	2020-12-05 17:52:21 +01:00