Merge remote-tracking branch 'origin/develop'
# Conflicts: # config/version.php
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
return array (
|
||||
'app_version' => 'v8.3.5',
|
||||
'full_app_version' => 'v8.3.5 - build 20406-gf92f76b48',
|
||||
'build_version' => '20406',
|
||||
'app_version' => 'v8.3.6',
|
||||
'full_app_version' => 'v8.3.6 - build 20551-g523df21d8',
|
||||
'build_version' => '20551',
|
||||
'prerelease_version' => '',
|
||||
'hash_version' => 'gf92f76b48',
|
||||
'full_hash' => 'v8.3.5-183-gf92f76b48',
|
||||
'hash_version' => 'g523df21d8',
|
||||
'full_hash' => 'v8.3.6-144-g523df21d8',
|
||||
'branch' => 'master',
|
||||
);
|
||||
Reference in New Issue
Block a user