Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2023-10-16 20:19:03 +01:00
commit 55d0c4021d

View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v6.2.2', 'app_version' => 'v6.2.3',
'full_app_version' => 'v6.2.2 - build 11714-ga95fae0e9', 'full_app_version' => 'v6.2.3 - build 11759-g8c4bf74f9',
'build_version' => '11714', 'build_version' => '11759',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'ga95fae0e9', 'hash_version' => 'g8c4bf74f9',
'full_hash' => 'v6.2.2-85-ga95fae0e9', 'full_hash' => 'v6.2.3-42-g8c4bf74f9',
'branch' => 'master', 'branch' => 'master',
); );