Changeset 3f5e485 for Prototype Application/Paw5/src/main/resources

Timestamp:

02/13/23 14:34:36 (17 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

a762b3a

Parents:

a2060cb (diff), 04e4f54 (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 create-post and login branches

resolved merge conflicts

Location:

Prototype Application/Paw5/src/main/resources/templates

Files:

• aboutUs.html (added)
• create-post.html (added)
• home.html (added)
• login.html (added)
• register.html (added)