Asal Lotfi
8bee973e7f
Merge remote-tracking branch 'origin/develop' into Sidebar-Menu
# Conflicts:
# src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java
# src/main/java/org/to/telegramfinalproject/Database/ContactDatabase.java
# src/main/java/org/to/telegramfinalproject/Database/MessageDatabase.java
# src/main/java/org/to/telegramfinalproject/Models/ContactEntry.java
# src/main/java/org/to/telegramfinalproject/Models/Message.java
# src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java
# src/main/resources/init.sql