Skip to content
Snippets Groups Projects
Commit f9251f8c authored by Lukas Werner's avatar Lukas Werner
Browse files

merged origin/2024.0 into main

#  merge had 2 conflicting files:
#     package-lock.json
#     package.json
parents 2bab0bd6 ab1c846c
No related branches found
No related tags found
No related merge requests found
{
"name": "@aditosoftware/platform",
"version": "2023.2.0-SNAPSHOT.1",
"version": "2024.0.2-SNAPSHOT.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@aditosoftware/platform",
"version": "2023.2.0-SNAPSHOT.1",
"version": "2024.0.2-SNAPSHOT.0",
"dependencies": {
"@aditosoftware/basic-base": ">=2023.2.0-SNAPSHOT <2023.2.1",
"@aditosoftware/basic-base": ">=2024.0.2-SNAPSHOT <2024.0.3",
"@aditosoftware/offline": "^1.0.0-SNAPSHOT.1"
},
"devDependencies": {
......@@ -16,9 +16,9 @@
}
},
"node_modules/@aditosoftware/basic-base": {
"version": "2023.2.0-SNAPSHOT.27",
"resolved": "https://nexus.adito.cloud/repository/xrm/@aditosoftware/basic-base/-/basic-base-2023.2.0-SNAPSHOT.27.tgz",
"integrity": "sha512-rBMiiE0O9E0FJ0Or+LXfYCZkpx3MuZ5RoW5/jzF1p+Qwdt49/reeTEEFuYxfjy8NlK4eIMSJGfag6fP4WeXNaA=="
"version": "2024.0.2-SNAPSHOT.0",
"resolved": "https://nexus.adito.cloud/repository/xrm/@aditosoftware/basic-base/-/basic-base-2024.0.2-SNAPSHOT.0.tgz",
"integrity": "sha512-fW5K9OrD+HV5FM301PUTEcPlL23tqSJZJ5LDeLww7kUFblRvp4f3ta5u93ehmZf0+QT4grwOnbRQyNluPTJSZg=="
},
"node_modules/@aditosoftware/jdito-types": {
"version": "2023.0.0",
......
{
"name": "@aditosoftware/platform",
"version": "2023.2.0-SNAPSHOT.1",
"version": "2024.0.2-SNAPSHOT.0",
"type": "module",
"dependencies": {
"@aditosoftware/basic-base": ">=2023.2.0-SNAPSHOT <2023.2.1",
"@aditosoftware/basic-base": ">=2024.0.2-SNAPSHOT <2024.0.3",
"@aditosoftware/offline": "^1.0.0-SNAPSHOT.1"
},
"devDependencies": {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment