A free open source IT asset/license management system
Merge remote-tracking branch 'origin/develop'
snipe069912d0513a
diff --cc config/version.phpindex e8183c76bd,d598c73216..49ca340293--- a/config/version.php+++ b/config/version.php@@@ -2,10 -2,10 +2,10 @@@return ['app_version' => 'v8.5.1-pre',- 'full_app_version' => 'v8.5.1-pre - build 22836-gc94fce2367',- 'build_version' => '22836',- 'full_app_version' => 'v8.5.1-pre - build 22809-g86245ad4ae',- 'build_version' => '22809',++ 'full_app_version' => 'v8.5.1-pre - build 22844-g86245ad4ae',++ 'build_version' => '22844','prerelease_version' => '',- 'hash_version' => 'gc94fce2367',- 'full_hash' => 'v8.5.1-pre-177-gc94fce2367',+ 'hash_version' => 'g86245ad4ae',+ 'full_hash' => 'v8.5.1-pre-185-g86245ad4ae',- 'branch' => 'develop',+ 'branch' => 'master',];