Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #5

Merged
merged 22 commits into from
Oct 14, 2023
Merged

Develop #5

merged 22 commits into from
Oct 14, 2023

Conversation

kostakupresak
Copy link
Contributor

No description provided.

nsobo and others added 22 commits October 14, 2023 10:23
…a-cenu-website into develop

# Conflicts:
#	frontend/src/scss/base/_icon-font.scss
…a-cenu-website into develop

# Conflicts:
#	Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Models/Generated/EducationPage.generated.cs
…a-cenu-website into develop

 Conflicts:
	Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/Header.cshtml
…a-cenu-website into develop

# Conflicts:
#	Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/EducationPage.cshtml
@kostakupresak kostakupresak merged commit ae64c99 into main Oct 14, 2023
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.

6 participants