Arnaud Vergnet 3485adfe7e Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/main/java/fr/insa/clavardator/users/UserList.java		2020-12-02 10:57:49 +01:00
..
java/fr/insa/clavardator	Merge remote-tracking branch 'origin/master'	2020-12-02 10:57:49 +01:00
resources/fr/insa/clavardator/ui	feat: use User class in user list and allow selection	2020-12-02 10:55:55 +01:00