Merge branch 'develop'
# Conflicts: # config/version.php
This commit is contained in:
commit
5204e84703
1 changed files with 4 additions and 4 deletions
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
return array (
|
||||
'app_version' => 'v4.1.8-pre',
|
||||
'full_app_version' => 'v4.1.8-pre - build 3068-gceca76b',
|
||||
'build_version' => '3068',
|
||||
'full_app_version' => 'v4.1.8-pre - build 3103-geb827cd',
|
||||
'build_version' => '3103',
|
||||
'prerelease_version' => '',
|
||||
'hash_version' => 'gceca76b',
|
||||
'full_hash' => 'v4.1.7-34-gceca76b',
|
||||
'hash_version' => 'geb827cd',
|
||||
'full_hash' => 'v4.1.7-69-geb827cd',
|
||||
'branch' => 'master',
|
||||
);
|
||||
|
|
Loading…
Add table
Reference in a new issue