Skip to content

Merge master into nona#44

Merged
AlexDim1 merged 14 commits intononafrom
master
Dec 15, 2022
Merged

Merge master into nona#44
AlexDim1 merged 14 commits intononafrom
master

Conversation

@AlexDim1
Copy link
Owner

No description provided.

martovv01 and others added 14 commits December 12, 2022 19:48
Most of the frontend completed
# 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 fb564b9 into nona 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