composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	composer.json
#	composer.lock
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_files.php
#	lib/composer/autoload_real.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.php
This commit is contained in:
Pierre Goiffon
2022-06-28 11:04:03 +02:00
parent de040a0922 74f7775332
commit 784e553d23
140 changed files with 11164 additions and 2662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "2829a514164533f377c56a3cbe431aa4",
"content-hash": "a6c39020c30831aeef3d7d8fbc476c0e",
"packages": [
{
"name": "combodo/tcpdf",
@@ -1817,16 +1817,16 @@
},
{
"name": "scssphp/scssphp",
"version": "1.0.6",
"version": "v1.10.3",
"source": {
"type": "git",
"url": "https://github.com/scssphp/scssphp.git",
"reference": "5b3c9d704950d8f9637f5110c36c281ec47dc13c"
"reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/5b3c9d704950d8f9637f5110c36c281ec47dc13c",
"reference": "5b3c9d704950d8f9637f5110c36c281ec47dc13c",
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/0f1e1516ed2412ad43e42a6a319e77624ba1f713",
"reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713",
"shasum": ""
},
"require": {
@@ -1835,11 +1835,20 @@
"php": ">=5.6.0"
},
"require-dev": {
"phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
"squizlabs/php_codesniffer": "~2.5",
"twbs/bootstrap": "~4.3",
"bamarni/composer-bin-plugin": "^1.4",
"phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4",
"sass/sass-spec": "*",
"squizlabs/php_codesniffer": "~3.5",
"symfony/phpunit-bridge": "^5.1",
"thoughtbot/bourbon": "^7.0",
"twbs/bootstrap": "~5.0",
"twbs/bootstrap4": "4.6.1",
"zurb/foundation": "~6.5"
},
"suggest": {
"ext-iconv": "Can be used as fallback when ext-mbstring is not available",
"ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv"
},
"bin": [
"bin/pscss"
],
@@ -1876,9 +1885,9 @@
],
"support": {
"issues": "https://github.com/scssphp/scssphp/issues",
"source": "https://github.com/scssphp/scssphp/tree/master"
"source": "https://github.com/scssphp/scssphp/tree/v1.10.3"
},
"time": "2019-12-12T05:00:52+00:00"
"time": "2022-05-16T07:22:18+00:00"
},
{
"name": "symfony/cache",
@@ -5088,5 +5097,5 @@
"platform-overrides": {
"php": "7.2.5"
},
"plugin-api-version": "2.1.0"
"plugin-api-version": "2.3.0"
}