composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-07 10:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,596 Commits 140 Branches 134 Tags
ecf8bc42fa87cdeb28ef206daf06efb6867ad204
Commit Graph

2 Commits

Author SHA1 Message Date
Molkobain
d130959692 Merge remote-tracking branch 'origin/support/2.7' into support/3.0 
# Conflicts:
#	core/metamodel.class.php
 2023-08-18 10:14:51 +02:00
Molkobain
a8c689c6c0 N°6436 - Add unit test to ensure that we don't lose an API during merge between branches 2023-08-18 09:55:45 +02:00