Merge remote-tracking branch 'origin/v8/8.1' into v8/dev

# Conflicts: # src/SolutionInfo.cs
2019-09-25 14:13:33 +02:00
parent f2d8d3f44f 77ff96d64f
commit 263072d5cd
1 changed files with 3 additions and 0 deletions
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -349,6 +349,9 @@
          <DevelopmentServerVPath>/</DevelopmentServerVPath>
          <IISUrl>http://localhost:8200/</IISUrl>
          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <DevelopmentServerPort>8150</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://localhost:8150</IISUrl>
          <NTLMAuthentication>False</NTLMAuthentication>
          <UseCustomServer>False</UseCustomServer>
          <CustomServerUrl>