Hao Sun 2bcc9bdbf4 Merge branch 'zin_dev' ...

# Conflicts:
#	module/common/lang/zh-cn.php
#	module/product/lang/de.php
#	module/product/lang/en.php
#	module/product/lang/fr.php
#	module/product/lang/zh-cn.php
#	module/program/js/browse.js
#	module/program/lang/de.php
#	module/program/lang/en.php
#	module/program/lang/fr.php
#	module/program/lang/zh-cn.php
#	module/project/config.php
#	module/project/lang/de.php
#	module/project/lang/en.php
#	module/project/lang/fr.php
#	module/project/lang/zh-cn.php
#	module/search/view/buildform.html.php
#	module/task/control.php

2023-04-23 19:20:45 +08:00

..

de.php

Merge branch 'zin_dev'

2023-04-23 19:20:45 +08:00

en.php

Merge branch 'zin_dev'

2023-04-23 19:20:45 +08:00

fr.php

Merge branch 'zin_dev'

2023-04-23 19:20:45 +08:00

vi.php

* Adjust menu.

2022-08-03 13:32:41 +08:00

zh-cn.php

Merge branch 'zin_dev'

2023-04-23 19:20:45 +08:00

zh-tw.php

* Add the 15.6 version and upgrade.

2021-10-12 09:35:39 +08:00