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
..
chat	feat: sync chat with user selection	2020-12-02 12:16:30 +01:00
dialogs	feat: show snackbar on username change	2020-12-05 17:49:14 +01:00
users	Merge remote-tracking branch 'origin/master'	2020-12-05 17:52:21 +01:00
ButtonPressEvent.java	feat implement main ui components	2020-12-01 10:29:58 +01:00
MainController.java	Merge remote-tracking branch 'origin/master'	2020-12-05 17:52:21 +01:00
NoSelectionModel.java	feat: make no selection model generic	2020-12-02 10:55:26 +01:00
UserSelectedEvent.java	feat: sync chat with user selection	2020-12-02 12:16:30 +01:00