A free open source IT asset/license management system
Merge remote-tracking branch 'origin/develop'
snipec8bafdad79ba
diff --cc config/version.phpindex ef70958bb6,b8e50835ba..e8183c76bd--- a/config/version.php+++ b/config/version.php@@@ -1,10 -1,11 +1,11 @@@<?php- return array(- 'app_version' => 'v8.5.0',- 'full_app_version' => 'v8.5.0 - build 22652-g80d1bf6a7a',- 'build_version' => '22652',++ return [+ 'app_version' => 'v8.5.1-pre',- 'full_app_version' => 'v8.5.1-pre - build 22805-gc94fce2367',- 'build_version' => '22805',++ 'full_app_version' => 'v8.5.1-pre - build 22836-gc94fce2367',++ 'build_version' => '22836','prerelease_version' => '',- 'hash_version' => 'g80d1bf6a7a',- 'full_hash' => 'v8.5.0-467-g80d1bf6a7a',+ 'hash_version' => 'gc94fce2367',+ 'full_hash' => 'v8.5.1-pre-177-gc94fce2367',- 'branch' => 'develop',+ 'branch' => 'master',- );+ ];