Changeset 9d01998

Timestamp:

07/01/25 01:45:14 (4 months ago)

Author:

stefannovkovski <stefannovkovski10@…>

Branches:

main

Children:

303b3cb

Parents:

546d4ed (diff), 8c091e2 (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/com/example/domify/service/impl/LeaseServiceImpl.java
# src/main/java/com/example/domify/web/LeaseController.java
# src/main/java/com/example/domify/web/ListingController.java
# src/main/java/com/example/domify/web/UnitController.java
# src/main/resources/templates/create-lease.html
# src/main/resources/templates/create-listing.html
# src/main/resources/templates/create-unit.html
# src/main/resources/templates/interested.html
# src/main/resources/templates/leases.html
# src/main/resources/templates/listing.html

(No files)