Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2022-07-05 16:41:00 -07:00
commit f1488767f8

View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v6.0.6',
'full_app_version' => 'v6.0.6 - build 8300-gdf1e2687d',
'build_version' => '8300',
'app_version' => 'v6.0.7',
'full_app_version' => 'v6.0.7 - build 8351-gacc2e12f1',
'build_version' => '8351',
'prerelease_version' => '',
'hash_version' => 'gdf1e2687d',
'full_hash' => 'v6.0.6-172-gdf1e2687d',
'hash_version' => 'gacc2e12f1',
'full_hash' => 'v6.0.7-42-gacc2e12f1',
'branch' => 'master',
);