孙广明 379baac86d Merge branch 'master' into 'sprint/master_tanghucheng_project' ...

# Conflicts:
#   module/programplan/lang/en.php

2021-12-07 00:38:58 +00:00

..

de.php

…

en.php

Merge branch 'master' into 'sprint/master_tanghucheng_project'

2021-12-07 00:38:58 +00:00

fr.php

…

vi.php

…

zh-cn.php

* adjust for date format for programplan.

2021-12-06 14:49:53 +08:00

zh-tw.php

…