composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-25 21:34:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,235 Commits 152 Branches 134 Tags
e91e53c0ecc9de7af1ea4eef36e90091590a54ed
Commit Graph

4 Commits

Author SHA1 Message Date
Eric Espie
e91e53c0ec Merge remote-tracking branch 'origin/support/3.0' into develop 
# Conflicts:
#	composer.lock
#	datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
#	lib/composer/autoload_files.php
#	lib/composer/autoload_real.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.json
#	lib/composer/installed.php
 2022-07-11 17:24:06 +02:00
Molkobain
6086131d3c Merge remote-tracking branch 'origin/support/3.0' into develop 2022-05-20 09:36:03 +02:00
Molkobain
2b0cc4d0e7 Merge remote-tracking branch 'origin/support/3.0' into develop 2022-05-18 20:01:52 +02:00
Pierre Goiffon
5f575d524a N°4621 Fix naming inconsistencies in sources/* 2021-12-31 15:44:59 +01:00