schrom01 d8dbd93c15 Merge branch 'main' into Refactoring_ClientConnectionHandler ...

# Conflicts:
#	client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java
#	client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java

2022-04-14 22:02:39 +02:00

..

java/ch/zhaw/pm2/multichat/client

Merge branch 'main' into Refactoring_ClientConnectionHandler

2022-04-14 22:02:39 +02:00

resources/ch/zhaw/pm2/multichat/client

activated Textwrapping for Textarea in ChatWindow.fxml

2022-04-12 13:20:25 +02:00