yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v9/dev' into netcore/feature/get_rid_of_ICoreComposer

Browse Source 
# Conflicts:
#	src/Umbraco.Examine.Lucene/ExamineLuceneComposer.cs
#	src/Umbraco.Examine.Lucene/ExamineLuceneConfigureIndexes.cs
#	src/Umbraco.Examine.Lucene/ExamineLuceneFinalComposer.cs
#	src/Umbraco.Examine.Lucene/ExamineLuceneStarting.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
#	src/Umbraco.PublishedCache.NuCache/Compose/NotificationsComposer.cs
#	src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
This commit is contained in:
Bjarke Berg
2021-06-15 19:10:30 +02:00
parent 2afa7201ce 067395b0ff
commit 575e66b8eb
969 changed files with 28924 additions and 24595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.NetCore/appsettings.json
View File

@@ -18,7 +18,7 @@
"Notifications": {
"Email": "your@email.here"
},
"MacroErrors": "throw"
"MacroErrors": "Throw"
},
"Global": {
"DefaultUILanguage": "en-us",
@@ -66,7 +66,7 @@
"EnableTours": true
},
"ModelsBuilder": {
"ModelsMode": "PureLive",
"ModelsMode": "InMemoryAuto",
"Enable": true
}
}