Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2023-01-09 21:11:29 -08:00
commit 60dcaa9e94

View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v6.0.14',
'full_app_version' => 'v6.0.14 - build 9038-g163b3f6c0',
'build_version' => '9038',
'full_app_version' => 'v6.0.14 - build 9161-g799c9c910',
'build_version' => '9161',
'prerelease_version' => '',
'hash_version' => 'g163b3f6c0',
'full_hash' => 'v6.0.14-113-g163b3f6c0',
'hash_version' => 'g799c9c910',
'full_hash' => 'v6.0.14-117-g799c9c910',
'branch' => 'master',
);