composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.2' into develop

Browse Source 
# Conflicts:
#	css/setup.css
#	datamodels/2.x/itop-portal-base/portal/public/css/portal.css
#	package-lock.json
This commit is contained in:
Stephen Abello
2026-04-29 16:58:50 +02:00
parent ea35ad48d2 de4ec9d9ce
commit 8de5c2525b
179 changed files with 7748 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@@ -140,8 +140,8 @@
}
},
"node_modules/ckeditor5-itop-build": {
"version": "3.2.0",
"resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#303d2091805b12fce8807019f599b0a9601c9cfa",
"version": "3.3.0",
"resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#21b6edc3348d3f1804e3ae8aab1567ac888a2f30",
"license": "SEE LICENSE IN LICENSE.md"
},
"node_modules/clipboard": {
@@ -437,7 +437,7 @@
}
},
"ckeditor5-itop-build": {
"version": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#303d2091805b12fce8807019f599b0a9601c9cfa",
"version": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#21b6edc3348d3f1804e3ae8aab1567ac888a2f30",
"from": "ckeditor5-itop-build@github:Combodo/ckeditor5-itop-build"
},
"clipboard": {