Merge branch 'umbraco-package'

skttl · skttl · commit 0b158b1b5f66 · 2024-03-13T20:31:11.000+01:00
# Conflicts:
#	src/Umbraco.Community.ImageSharpRemoteImages/Umbraco.Community.ImageSharpRemoteImages.csproj
#	src/demos/RemoteImageProviderUmbracoDemo/appsettings.json
diff --git a/src/demos/RemoteImageProviderUmbracoDemo/appsettings.json b/src/demos/RemoteImageProviderUmbracoDemo/appsettings.json
@@ -17,7 +17,7 @@
         "Settings": [
           {
             "Prefix": "/ourumb",
-            "RemoteUrlPrefix": "https://our.umbraco.com/",
+            "RemoteUrlPrefix": "https://our.umbraco.com",
             "AllowedDomains": [ "our.umbraco.com" ]
           },
           {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"Settings": [`
`18`	`18`	`{`
`19`	`19`	`"Prefix": "/ourumb",`
`20`		`- "RemoteUrlPrefix": "https://our.umbraco.com/",`
	`20`	`+ "RemoteUrlPrefix": "https://our.umbraco.com",`
`21`	`21`	`"AllowedDomains": [ "our.umbraco.com" ]`
`22`	`22`	`},`
`23`	`23`	`{`