Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2020-10-23 14:29:40 -07:00
commit 79a4acae1a

View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v5.0.2', 'app_version' => 'v5.0.3',
'full_app_version' => 'v5.0.2 - build 5414-gc3e8f6406', 'full_app_version' => 'v5.0.3 - build 5443-g5f8221470',
'build_version' => '5414', 'build_version' => '5443',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'gc3e8f6406', 'hash_version' => 'g5f8221470',
'full_hash' => 'v5.0.1-19-gc3e8f6406', 'full_hash' => 'v5.0.2-27-g5f8221470',
'branch' => 'master', 'branch' => 'master',
); );