composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-08-25 15:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
develop
iTop/datamodels
History
Benjamin DALSASS 54a0dfd06f Merge branch 'support/3.2' into develop 
# Conflicts:
#	application/transaction.class.inc.php
#	dictionaries/en.dictionary.itop.ui.php
#	dictionaries/fr.dictionary.itop.ui.php
#	dictionaries/pt_br.dictionary.itop.ui.php
#	dictionaries/ru.dictionary.itop.ui.php
#	dictionaries/zh_cn.dictionary.itop.ui.php
2026-08-25 07:16:55 +02:00
..
2.x
Merge branch 'support/3.2' into develop
2026-08-25 07:16:55 +02:00
.htaccess
…
web.config
…