diff --git a/CHANGELOG b/CHANGELOG index ff17ee08a..084309c92 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -118,6 +118,7 @@ - do not periodically count tasks if task list in menu is turned off - use utf8_basename() in op.ImportFS.php - update font-awesome from 3.1.0 to 3.2.1 +- merged changes up to 5.0.14 -------------------------------------------------------------------------------- Changes in version 5.1.6 @@ -216,6 +217,7 @@ -------------------------------------------------------------------------------- - use cmd timeout when indexing documents (Closes #344) - add change password function to rest api (merge from sebbuku) +- merged changes from 4.3.37 -------------------------------------------------------------------------------- Changes in version 5.0.13 diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 2095ca85e..48138af1b 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -1565,7 +1565,7 @@ returns just users which are not disabled - 2018-12-08 + 2018-02-14 5.1.6