composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 08:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,640 Commits 134 Branches 135 Tags
feature/faf_doc_twig_blocks
Commit Graph

52 Commits

Author SHA1 Message Date
Pierre Goiffon
b880ca05a5 Merge remote-tracking branch 'origin/support/2.5' into release/2.6 
# Conflicts:
#	composer.json
#	setup/setuputils.class.inc.php
 2018-12-17 17:04:39 +01:00
“purplegrape”
9828b905b2 rename chinese translation file from zh.dict*php to zh_cn.dict*php . 
in case guys from HongKong ,TaiWan or Singapore wana have their own translations.
 2018-12-17 11:16:25 +01:00