Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php
This commit is contained in:
commit
027361f079
1 changed files with 5 additions and 5 deletions
|
@ -1,10 +1,10 @@
|
||||||
<?php
|
<?php
|
||||||
return array (
|
return array (
|
||||||
'app_version' => 'v6.3.2',
|
'app_version' => 'v6.3.3',
|
||||||
'full_app_version' => 'v6.3.2 - build 12875-g21ad7f549',
|
'full_app_version' => 'v6.3.3 - build 12903-g0f63fa23e',
|
||||||
'build_version' => '12875',
|
'build_version' => '12903',
|
||||||
'prerelease_version' => '',
|
'prerelease_version' => '',
|
||||||
'hash_version' => 'g21ad7f549',
|
'hash_version' => 'g0f63fa23e',
|
||||||
'full_hash' => 'v6.3.2-39-g21ad7f549',
|
'full_hash' => 'v6.3.3-67-g0f63fa23e',
|
||||||
'branch' => 'master',
|
'branch' => 'master',
|
||||||
);
|
);
|
Loading…
Add table
Reference in a new issue