Changeset 1e83903

Timestamp:

09/03/25 01:19:18 (5 weeks ago)

Author:

NorksX <borismanev03@…>

Branches:

main

Children:

4a13d36

Parents:

ac37cef (diff), 718f543 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/main'

# Conflicts:
# src/main/java/mk/ukim/finki/synergymed/repositories/ClientRepository.java
# src/main/java/mk/ukim/finki/synergymed/web/LoginController.java
# src/main/java/mk/ukim/finki/synergymed/web/PaymentController.java
# src/main/java/mk/ukim/finki/synergymed/web/ProfileController.java
# src/main/java/mk/ukim/finki/synergymed/web/ShoppingCartController.java

(No files)