caoyanyi
acc26ba24d
Merge remote-tracking branch 'remotes/origin/release-20.0'
# Conflicts:
# db/update20.0.beta2.sql
# lib/zin/func.php
# lib/zin/wg/fileselector/v1.php
# lib/zin/wg/upload/v1.php
# module/action/model.php
# module/backup/js/index.ui.js
# module/block/lang/vi.php
# module/block/ui/recentprojectblock.html.php
# module/block/zen.php
# module/common/lang/vi.php
# module/custom/lang/vi.php
# module/execution/js/kanban.ui.js
# module/execution/ui/story.html.php
# module/kanban/js/view.ui.js
# module/metric/test/calc/project/hour/ac_of_weekly_all_in_waterfall.php
# module/metric/test/calc/project/rate/cv_in_waterfall.php
# module/metric/test/calc/project/rate/cv_weekly_in_waterfall.php
# module/mr/control.php
# module/mr/ui/browsebyexecution.html.php
# module/product/zen.php
# module/programplan/zen.php
# module/project/model.php
# module/repo/lang/de.php
# module/repo/lang/en.php
# module/repo/lang/fr.php
# module/repo/lang/zh-cn.php
# module/space/ui/createapplication.html.php
# module/testcase/ui/view.html.php
# module/upgrade/model.php
# www/js/zui3/zen-editor/p-0aaccc7e.js
# www/js/zui3/zen-editor/p-276dd30f.js
# www/js/zui3/zen-editor/p-2b13cc9a.js
# www/js/zui3/zen-editor/p-38d18c5d.js
# www/js/zui3/zen-editor/p-3f6cad83.js
# www/js/zui3/zen-editor/p-51e3a048.js
# www/js/zui3/zen-editor/p-617d463f.js
# www/js/zui3/zen-editor/p-62c0132e.js
# www/js/zui3/zen-editor/p-6d22490c.js
# www/js/zui3/zen-editor/p-a563f50b.js
# www/js/zui3/zen-editor/p-bf31230c.js
# www/js/zui3/zen-editor/p-c6c95773.js
# www/js/zui3/zen-editor/p-d83dd3f0.js
# www/js/zui3/zen-editor/p-d8bedd14.js
# www/js/zui3/zen-editor/p-eaaa4129.js
# www/js/zui3/zen-editor/zen-editor.esm.js
# www/js/zui3/zui.zentao.css
# www/js/zui3/zui.zentao.js