composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01: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_files.php
#	lib/composer/autoload_real.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.json
#	lib/composer/installed.php
#	lib/firebase/php-jwt/README.md
#	lib/firebase/php-jwt/src/CachedKeySet.php
#	lib/firebase/php-jwt/src/JWK.php
#	lib/firebase/php-jwt/src/JWT.php
This commit is contained in:
Molkobain
2023-02-23 16:27:50 +01:00
parent 758933ae74 7aad60ed1b
commit 1980cf4700
10 changed files with 242 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@@ -14,6 +14,7 @@
"ext-soap": "*",
"apereo/phpcas" : "~1.6.0",
"combodo/tcpdf": "~6.4.4",
"firebase/php-jwt": "~6.4.0",
"guzzlehttp/guzzle": "^7.4.5",
"laminas/laminas-mail": "^2.11",
"laminas/laminas-servicemanager": "^3.5",