yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c97375d478be7e89c238d434bbb1ca980526c6ed
Umbraco-CMS/src/Umbraco.Core/ContentApps
History
Bjarke Berg 2ffb01530a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Compose/AuditEventsComponent.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/HtmlStringUtilities.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
2020-06-28 12:48:19 +02:00
..
ContentAppFactoryCollection.cs
…
ContentAppFactoryCollectionBuilder.cs
…
ContentEditorContentAppFactory.cs
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-06-28 12:48:19 +02:00
ContentInfoContentAppFactory.cs
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-06-28 12:48:19 +02:00
ContentTypeDesignContentAppFactory.cs
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-06-28 12:48:19 +02:00
ContentTypeListViewContentAppFactory.cs
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-06-28 12:48:19 +02:00
ContentTypePermissionsContentAppFactory.cs
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-06-28 12:48:19 +02:00
ContentTypeTemplatesContentAppFactory.cs
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-06-28 12:48:19 +02:00
ListViewContentAppFactory.cs
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-06-28 12:48:19 +02:00