Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php
This commit is contained in:
snipe
2024-08-20 19:45:53 +01:00

View File

@@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v7.0.11',
'full_app_version' => 'v7.0.11 - build 14904-g6c0cf9447',
'build_version' => '14904',
'full_app_version' => 'v7.0.11 - build 15044-g46ed07642',
'build_version' => '15044',
'prerelease_version' => '',
'hash_version' => 'g6c0cf9447',
'full_hash' => 'v7.0.11-218-g6c0cf9447',
'hash_version' => 'g46ed07642',
'full_hash' => 'v7.0.11-133-g46ed07642',
'branch' => 'master',
);