Merge branch 'develop'
# Conflicts: # config/version.php
This commit is contained in:
commit
11832daf5c
1 changed files with 3 additions and 3 deletions
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
return array (
|
||||
'app_version' => 'v4.3.1',
|
||||
'full_app_version' => 'v4.3.1 - build 3630-ge63687579',
|
||||
'app_version' => 'v4.4.0',
|
||||
'full_app_version' => 'v4.4.0 - build 3630-ge63687579',
|
||||
'build_version' => '3630',
|
||||
'prerelease_version' => '',
|
||||
'hash_version' => 'ge63687579',
|
||||
'full_hash' => 'v4.3.0-48-ge63687579',
|
||||
'branch' => master',
|
||||
'branch' => 'master',
|
||||
);
|
||||
|
|
Loading…
Add table
Reference in a new issue