Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source 
Conflicts:
	module/dev/lang/en.php
This commit is contained in:
xia0ta0
2015-03-05 09:20:44 +08:00
parent 22f0a7fb22 fdc283afd7
commit ab274a4ff8
56 changed files with 1320 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/dev/lang/en.php
+16
View File
@@ -1,4 +1,5 @@
<?php
<<<<<<< HEAD
$lang->dev->common = 'Develop';
$lang->dev->api = 'API';
$lang->dev->db = 'Database';
@@ -79,3 +80,18 @@ $lang->dev->tableList['svn'] = 'SVN';
$lang->dev->tableList['testcase'] = 'Testcase';
$lang->dev->tableList['tree'] = 'Tree';
$lang->dev->tableList['upgrade'] = 'Upgrade';
=======
$lang->dev->common = 'Dev';
$lang->dev->api = 'API';
$lang->dev->db = 'Database';
$lang->dev->editor = 'Editor';
$lang->dev->dbList = 'Datebases';
$lang->dev->fields = array();
$lang->dev->fields['id'] = 'ID';
$lang->dev->fields['name'] = 'Field';
$lang->dev->fields['desc'] = 'Desc';
$lang->dev->fields['type'] = 'Type';
$lang->dev->fields['length'] = 'Length';
$lang->dev->fields['null'] = 'Empty';
>>>>>>> fdc283afd74c3cf379fd24153ece79fe519c0b20