Merge remote-tracking branch 'origin/develop' into Real-Time-update

# Conflicts: # src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java # src/main/java/org/to/telegramfinalproject/UI/LoginForm.java # src/main/java/org/to/telegramfinalproject/UI/RegisterForm.java
2025-07-24 22:22:04 +03:30
parent f54bffea43 64724aabdd
commit abb1e081a8
10 changed files with 21 additions and 249 deletions
@@ -118,8 +118,4 @@ public class User {

    public List<ChatEntry> getChatList(){return  this.chatList;}

-
-
-
-}
-
+}