Merge branch 'v8/8.14' into v8/8.15

# Conflicts: # src/SolutionInfo.cs
2021-07-20 10:17:40 +02:00
parent 2a6bdf7330 3def2ee2ad
commit fce0bd0cfd
2 changed files with 16 additions and 0 deletions
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -351,6 +351,9 @@
          <DevelopmentServerPort>8150</DevelopmentServerPort>
          <DevelopmentServerVPath>/</DevelopmentServerVPath>
          <IISUrl>http://localhost:8150</IISUrl>
+          <DevelopmentServerPort>8141</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://localhost:8141</IISUrl>
          <DevelopmentServerPort>8131</DevelopmentServerPort>
          <DevelopmentServerVPath>/</DevelopmentServerVPath>
          <IISUrl>http://localhost:8131</IISUrl>