gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 13:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2020-09-29 16:40:03 +02:00
commit 94e57c6a5b
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG
View File

@ -1,3 +1,8 @@
--------------------------------------------------------------------------------
Changes in version 6.0.14
--------------------------------------------------------------------------------
- merge changes up to 5.1.21
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 6.0.13 Changes in version 6.0.13
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -171,6 +176,10 @@
- add document list which can be exported as an archive - add document list which can be exported as an archive
- search results can be exported - search results can be exported
--------------------------------------------------------------------------------
Changes in version 5.1.21
--------------------------------------------------------------------------------
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.20 Changes in version 5.1.20
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

2
SeedDMS_Core/Core/inc.ClassDMS.php
View File

@ -472,7 +472,7 @@ class SeedDMS_Core_DMS {
$this->lasterror = ''; $this->lasterror = '';
$this->version = '@package_version@'; $this->version = '@package_version@';
if($this->version[0] == '@') if($this->version[0] == '@')
$this->version = '6.0.13'; $this->version = '6.0.14';
} /* }}} */ } /* }}} */
/** /**

2
inc/inc.Version.php
View File

@ -20,7 +20,7 @@
class SeedDMS_Version { /* {{{ */ class SeedDMS_Version { /* {{{ */
const _number = "6.0.13"; const _number = "6.0.14";
const _string = "SeedDMS"; const _string = "SeedDMS";
function __construct() { function __construct() {