Merge branch 'master' into 165_package

2022-03-28 08:50:18 +08:00
parent b6724d3971 c2a4bd5cbf
commit 15a3516aca
194 changed files with 3440 additions and 955 deletions
@@ -16,6 +16,7 @@
 <?php js::set('weekend', $config->execution->weekend);?>
 <?php js::set('errorSameProducts', $lang->project->errorSameProducts);?>
 <?php js::set('errorSameBranches', $lang->project->errorSameBranches);?>
+<?php js::set('errorSamePlans', $lang->project->errorSamePlans);?>
 <?php js::set('oldParent', $project->parent);?>
 <?php js::set('projectID', $project->id);?>
 <?php js::set('longTime', $lang->project->longTime);?>