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

Merge branch 'v8/8.9' into v8/dev

Browse Source 
# Conflicts:
#	src/SolutionInfo.cs
This commit is contained in:
Sebastiaan Janssen
2020-11-04 11:30:27 +01:00
parent dbee98bf02 ca098e8a01
commit e42b8b20f4
8 changed files with 27 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -346,9 +346,9 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>8900</DevelopmentServerPort>
<DevelopmentServerPort>8910</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:8900</IISUrl>
<IISUrl>http://localhost:8910</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

2
src/Umbraco.Web.UI/web.Template.config
View File

@@ -72,7 +72,7 @@
you must configure your SMTP settings here - for example:
-->
<!--
<smtp from="noreply@example.com">
<smtp from="noreply@example.com" deliveryMethod="Network">
<network host="localhost" port="25" enableSsl="false" userName="" password="" />
</smtp>
-->