diff --git a/CHANGELOG b/CHANGELOG index eba8326b2..13405a3ec 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +-------------------------------------------------------------------------------- + Changes in version 6.0.36 +-------------------------------------------------------------------------------- +- merge changes up to 5.1.43 + -------------------------------------------------------------------------------- Changes in version 6.0.35 -------------------------------------------------------------------------------- @@ -340,6 +345,10 @@ - add document list which can be exported as an archive - search results can be exported +-------------------------------------------------------------------------------- + Changes in version 5.1.43 +-------------------------------------------------------------------------------- + -------------------------------------------------------------------------------- Changes in version 5.1.42 -------------------------------------------------------------------------------- diff --git a/inc/inc.Version.php b/inc/inc.Version.php index 508ebe54a..2a11a1185 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { /* {{{ */ - const _number = "6.0.35"; + const _number = "6.0.36"; const _string = "SeedDMS"; function __construct() {