Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2023-11-22 23:41:31 +00:00
commit 776b16d379

View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v6.2.3',
'full_app_version' => 'v6.2.3 - build 11936-gb47e734b3',
'build_version' => '11936',
'app_version' => 'v6.2.4-pre',
'full_app_version' => 'v6.2.4-pre - build 12088-g780279a62',
'build_version' => '12088',
'prerelease_version' => '',
'hash_version' => 'gb47e734b3',
'full_hash' => 'v6.2.3-175-gb47e734b3',
'hash_version' => 'g780279a62',
'full_hash' => 'v6.2.4-pre-327-g780279a62',
'branch' => 'master',
);