Merge branch 'master' into 'sprint_200'
# Conflicts: # module/execution/lang/en.php # module/execution/lang/zh-cn.php # module/execution/view/kanban.html.php # module/kanban/css/space.css
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
* The view file of task module of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
|
||||
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
|
||||
* @package task
|
||||
* @version $Id: view.html.php 4808 2013-06-17 05:48:13Z zhujinyonging@gmail.com $
|
||||
|
||||
Reference in New Issue
Block a user