Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2022-08-25 12:34:38 -07:00
commit 4cc9b5a5a2

View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v6.0.9',
'full_app_version' => 'v6.0.9 - build 8587-gcca531f8c',
'build_version' => '8587',
'app_version' => 'v6.0.10',
'full_app_version' => 'v6.0.10 - build 8610-g22710afee',
'build_version' => '8610',
'prerelease_version' => '',
'hash_version' => 'gcca531f8c',
'full_hash' => 'v6.0.9-68-gcca531f8c',
'hash_version' => 'g22710afee',
'full_hash' => 'v6.0.10-91-g22710afee',
'branch' => 'master',
);