Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php
This commit is contained in:
commit
cbb5b6e846
1 changed files with 5 additions and 5 deletions
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
return array (
|
||||
'app_version' => 'v7.0.1',
|
||||
'full_app_version' => 'v7.0.1 - build 13553-g9fccafa3a',
|
||||
'build_version' => '13553',
|
||||
'app_version' => 'v7.0.2',
|
||||
'full_app_version' => 'v7.0.2 - build 13978-g430808e18',
|
||||
'build_version' => '13978',
|
||||
'prerelease_version' => '',
|
||||
'hash_version' => 'g9fccafa3a',
|
||||
'full_hash' => 'v7.0.1-51-g9fccafa3a',
|
||||
'hash_version' => 'g430808e18',
|
||||
'full_hash' => 'v7.0.2-12-g430808e18',
|
||||
'branch' => 'master',
|
||||
);
|
Loading…
Add table
Reference in a new issue