lmasi/webzine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into J1/feat/AdminTitreIHM

Browse Source 
# Conflicts:
#	Webzine.WebApplication/Areas/Administration/ViewModels/Accueil/AccueilIndexViewModel.cs
#	Webzine.WebApplication/Areas/Administration/ViewModels/ArtisteModel.cs
#	Webzine.WebApplication/Areas/Administration/Views/Commentaires/Index.cshtml
#	Webzine.WebApplication/Areas/Administration/Views/Shared/_Layout.cshtml
#	Webzine.WebApplication/Controllers/AccueilController.cs
#	Webzine.WebApplication/Webzine.WebApplication.csproj
This commit is contained in:
mirage
2026-03-05 16:55:44 +01:00
parent de6ca18eac 39ed42405b
commit d34c7ade13
38 changed files with 781 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Webzine.WebApplication/Controllers/TitreController.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Mvc;
using Webzine.Entity;
using Webzine.Entity.Fixtures;
using Webzine.WebApplication.ViewsModels.Titre;
using Webzine.WebApplication.ViewModels.Titre;
namespace Webzine.WebApplication.Controllers;