diff --git a/CHANGELOG b/CHANGELOG index dbec41e94..e5eca071a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +-------------------------------------------------------------------------------- + Changes in version 6.0.35 +-------------------------------------------------------------------------------- +- merge changes up to 5.1.42 + -------------------------------------------------------------------------------- Changes in version 6.0.34 -------------------------------------------------------------------------------- @@ -331,6 +336,10 @@ - add document list which can be exported as an archive - search results can be exported +-------------------------------------------------------------------------------- + Changes in version 5.1.42 +-------------------------------------------------------------------------------- + -------------------------------------------------------------------------------- Changes in version 5.1.41 -------------------------------------------------------------------------------- diff --git a/inc/inc.Version.php b/inc/inc.Version.php index c05720d98..508ebe54a 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { /* {{{ */ - const _number = "6.0.34"; + const _number = "6.0.35"; const _string = "SeedDMS"; function __construct() {