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

Merge remote-tracking branch 'origin/v12/dev' into v13/dev

Browse Source 
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.New.Cms.Infrastructure/Umbraco.New.Cms.Infrastructure.csproj
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	tests/Umbraco.Tests.Integration/CompatibilitySuppressions.xml
This commit is contained in:
Bjarke Berg
2023-11-28 10:29:13 +01:00
parent 32493c759a 1176f04caf
commit 1f527fefd8
39 changed files with 226 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.UI.Client/package-lock.json generated
View File

@@ -9,7 +9,7 @@
"@microsoft/signalr": "7.0.12",
"@umbraco-ui/uui": "1.5.0",
"@umbraco-ui/uui-css": "1.5.0",
"ace-builds": "1.31.0",
"ace-builds": "1.31.1",
"angular": "1.8.3",
"angular-animate": "1.8.3",
"angular-aria": "1.8.3",
@@ -3116,9 +3116,9 @@
}
},
"node_modules/ace-builds": {
"version": "1.31.0",
"resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.31.0.tgz",
"integrity": "sha512-nitIhcUYA6wyO3lo2WZBPX5fcjllW6XFt4EFyHwcN2Fp70/IZwz8tdw6a0+8udDEwDj/ebt3aWEClIyCs/6qYA=="
"version": "1.31.1",
"resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.31.1.tgz",
"integrity": "sha512-3DnE5bZF6Ji+l4F5acoLk+rV7mxrUt1C4r61Xy9owp5rVM4lj5NL8GJfoX6Jnnbhx6kKV7Vdpb+Tco+0ORTvhg=="
},
"node_modules/acorn": {
"version": "8.9.0",