Merge remote-tracking branch 'origin/develop'
# Conflicts: # config/version.php
This commit is contained in:
+5
-5
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
return array (
|
||||
'app_version' => 'v5.0.2',
|
||||
'full_app_version' => 'v5.0.2 - build 5414-gc3e8f6406',
|
||||
'build_version' => '5414',
|
||||
'app_version' => 'v5.0.3',
|
||||
'full_app_version' => 'v5.0.3 - build 5443-g5f8221470',
|
||||
'build_version' => '5443',
|
||||
'prerelease_version' => '',
|
||||
'hash_version' => 'gc3e8f6406',
|
||||
'full_hash' => 'v5.0.1-19-gc3e8f6406',
|
||||
'hash_version' => 'g5f8221470',
|
||||
'full_hash' => 'v5.0.2-27-g5f8221470',
|
||||
'branch' => 'master',
|
||||
);
|
||||
Reference in New Issue
Block a user