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

Merge branch 'v8/8.6' into v8/dev

Browse Source 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
This commit is contained in:
Sebastiaan Janssen
2020-10-22 14:18:21 +02:00
parent dc6c72c136 843ea1d854
commit befa23190b
11 changed files with 244 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -349,6 +349,9 @@
<DevelopmentServerPort>8900</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:8900</IISUrl>
<DevelopmentServerPort>8660</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:8660</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>