Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2020-11-30 17:28:46 -08:00
commit 60d269afb5

View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v5.0.9',
'full_app_version' => 'v5.0.9 - build 5616-973eacf6c3',
'build_version' => '5616',
'app_version' => 'v5.0.10',
'full_app_version' => 'v5.0.10 - build 5680-gf9b1fdc36',
'build_version' => '5680',
'prerelease_version' => '',
'hash_version' => '973eacf6c3',
'full_hash' => 'v5.0.9-87-973eacf6c3',
'hash_version' => 'gf9b1fdc36',
'full_hash' => 'v5.0.10-21-gf9b1fdc36',
'branch' => 'master',
);