yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ffa664f2178f90cf84e553d336d0ef18bc1cf4bc
Umbraco-CMS/templates
History
Bjarke Berg 6fbf04592c Merge remote-tracking branch 'origin/v13/dev' into v14/dev 
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Cms.Api.Delivery/Controllers/DeliveryApiControllerBase.cs
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
#	src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageDataInstallationTests.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs
2023-08-28 11:46:22 +02:00
..
UmbracoPackage
Merge remote-tracking branch 'origin/v13/dev' into v14/dev
2023-07-07 08:56:17 +02:00
UmbracoPackageRcl
Updated template to .net8
2023-08-02 09:46:14 +02:00
UmbracoProject
Merge remote-tracking branch 'origin/v13/dev' into v14/dev
2023-08-08 12:10:18 +02:00
Directory.Build.props
Fix duplicate Directory.Build.props import
2022-08-26 09:19:55 +02:00
Umbraco.Templates.csproj
Merge remote-tracking branch 'origin/v13/dev' into v14/dev
2023-08-28 11:46:22 +02:00