Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
return array (
|
||||
'app_version' => 'v8.0.2',
|
||||
'full_app_version' => 'v8.0.2 - build 17048-g44dd06161',
|
||||
'build_version' => '17048',
|
||||
'app_version' => 'v8.0.3',
|
||||
'full_app_version' => 'v8.0.3 - build 17154-ged8a48672',
|
||||
'build_version' => '17154',
|
||||
'prerelease_version' => '',
|
||||
'hash_version' => 'g44dd06161',
|
||||
'full_hash' => 'v8.0.2-54-g44dd06161',
|
||||
'hash_version' => 'ged8a48672',
|
||||
'full_hash' => 'v8.0.3-99-ged8a48672',
|
||||
'branch' => 'master',
|
||||
);
|
||||
Reference in New Issue
Block a user