Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2024-01-27 15:12:03 +00:00
commit 86c625ed8f

View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v6.2.4-pre', 'app_version' => 'v6.3.0',
'full_app_version' => 'v6.2.4-pre - build 12343-gb23ce6cfc', 'full_app_version' => 'v6.3.0 - build 12490-g9136415bb',
'build_version' => '12343', 'build_version' => '12490',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'gb23ce6cfc', 'hash_version' => 'g9136415bb',
'full_hash' => 'v6.2.4-pre-582-gb23ce6cfc', 'full_hash' => 'v6.3.0-729-g9136415bb',
'branch' => 'master', 'branch' => 'master',
); );