Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2020-11-09 21:46:26 -08:00
commit 118931b6fb

View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v5.0.5-pre', 'app_version' => 'v5.0.5',
'full_app_version' => 'v5.0.5-pre-52-g63a8535de', 'full_app_version' => 'v5.0.5-52-g63a8535de',
'build_version' => '5509', 'build_version' => '5509',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g63a8535de', 'hash_version' => 'g63a8535de',
'full_hash' => 'v5.0.5-pre-52-g63a8535de', 'full_hash' => 'v5.0.5-52-g63a8535de',
'branch' => 'develop', 'branch' => 'develop',
); );