Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts: # src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs # src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs # src/Umbraco.Web.UI.Client/src/views/users/user.controller.js # src/Umbraco.Web/Models/Trees/MenuItemList.cs # src/Umbraco.Web/Runtime/WebInitialComposer.cs # src/Umbraco.Web/Trees/RelationTypeTreeController.cs # src/Umbraco.Web/UmbracoApplication.cs
This commit is contained in:
@@ -14,6 +14,10 @@
|
||||
"content": "<p>Thank you for using Umbraco! Would you like to stay up-to-date with Umbraco product updates, security advisories, community news and special offers? Sign up for our newsletter and never miss out on the latest Umbraco news.</p> <p class='notice'>By signing up, you agree that we can use your info according to our <a href='https://umbraco.com/about-us/privacy/'>privacy policy</a>.</p>",
|
||||
"view": "emails",
|
||||
"type": "promotion"
|
||||
},
|
||||
{
|
||||
"title": "Thank you for subscribing to our mailing list",
|
||||
"view": "confirm"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user