Skip to content

Merge repair-branch with H5P-Player#817

Merged
andreasweishaupt merged 104 commits intomainfrom
repair-branch
Oct 10, 2025
Merged

Merge repair-branch with H5P-Player#817
andreasweishaupt merged 104 commits intomainfrom
repair-branch

Conversation

@andreasweishaupt
Copy link
Copy Markdown
Member

No description provided.

defnegoncu and others added 30 commits April 1, 2025 11:36
# Conflicts:
#	AuthoringToolTest/Mapping/EntityPersistEntityMappingProfileUt.cs
#	AuthoringToolTest/Mapping/ViewModelEntityMappingProfileUt.cs
#	Presentation/Components/ContentFiles/ContentFilesView.razor
#	Presentation/Components/Forms/Element/CreateElementForm.razor
#	Presentation/Components/Forms/Element/EditElementForm.razor
e01118 and others added 29 commits August 25, 2025 14:24
# Conflicts:
#	Presentation/Components/ContentFiles/ContentFilesContainer.razor
#	Presentation/Components/ContentFiles/ContentFilesView.razor
#	Presentation/Components/Forms/Element/EditElementForm.razor
#	Presentation/View/HeaderBar.razor
@andreasweishaupt andreasweishaupt merged commit b71e4e7 into main Oct 10, 2025
23 checks passed
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.

4 participants