composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +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

8
composer.lock generated
View File

@@ -1605,12 +1605,12 @@
"source": {
"type": "git",
"url": "https://github.com/combodo-itop-libs/scssphp.git",
"reference": "dde81c0a39d02e8e6fc81b70269747734e16d526"
"reference": "6820f035182a956c355cbfa7882d90f1198a208b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/combodo-itop-libs/scssphp/zipball/dde81c0a39d02e8e6fc81b70269747734e16d526",
"reference": "dde81c0a39d02e8e6fc81b70269747734e16d526",
"url": "https://api.github.com/repos/combodo-itop-libs/scssphp/zipball/6820f035182a956c355cbfa7882d90f1198a208b",
"reference": "6820f035182a956c355cbfa7882d90f1198a208b",
"shasum": ""
},
"require": {
@@ -1680,7 +1680,7 @@
"support": {
"source": "https://github.com/combodo-itop-libs/scssphp/tree/combodo/1.x"
},
"time": "2026-03-23T15:26:59+00:00"
"time": "2026-04-23T14:20:24+00:00"
},
{
"name": "soundasleep/html2text",