Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2022-11-03 14:18:55 -07:00
commit 23cbee9493

View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v6.0.12',
'full_app_version' => 'v6.0.12 - build 8876-gbc4c6abe0',
'build_version' => '8876',
'app_version' => 'v6.0.13',
'full_app_version' => 'v6.0.13 - build 8923-g30f4af3ac',
'build_version' => '8923',
'prerelease_version' => '',
'hash_version' => 'gbc4c6abe0',
'full_hash' => 'v6.0.12-50-gbc4c6abe0',
'hash_version' => 'g30f4af3ac',
'full_hash' => 'v6.0.13-97-g30f4af3ac',
'branch' => 'master',
);
);