Skip to content

I'm ready#43

Merged
AlexDim1 merged 11 commits intomasterfrom
martin
Dec 15, 2022
Merged

I'm ready#43
AlexDim1 merged 11 commits intomasterfrom
martin

Conversation

@martovv01
Copy link
Collaborator

No description provided.

# Conflicts:
#	src/main/resources/static/scripts/CssStyles/styleCompanyRegister.css
#	src/main/resources/static/scripts/CssStyles/styleLogin.css
#	src/main/resources/static/scripts/CssStyles/stylePersonRegister.css
#	src/main/resources/static/scripts/CssStyles/styleUser.css
#	src/main/resources/templates/editPerson.html
#	src/main/resources/templates/login.html
#	src/main/resources/templates/registerCompany.html
#	src/main/resources/templates/registerPerson.html
#	src/main/resources/templates/user.html
@AlexDim1 AlexDim1 merged commit 45a4916 into master Dec 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants