Merge branch 'master' into 'sprint/master_zhouxudong_56362'

# Conflicts: # module/kanban/model.php
2022-06-09 06:32:06 +00:00
parent 1da6718278 06768fb562
commit 084f66dd51
58 changed files with 588 additions and 98 deletions
@@ -214,4 +214,5 @@ js::set('priv',
 <?php js::set('fluidBoard', $execution->fluidBoard);?>
 <?php js::set('displayCards', $execution->displayCards);?>
 <?php js::set('reviewStoryParis', $reviewStoryParis);?>
+<?php js::set('needLinkProducts', $lang->execution->needLinkProducts);?>
 <?php include '../../common/view/footer.html.php';?>