Merge branch 'develop'

# Conflicts: # config/version.php
2018-01-20 04:00:26 -08:00
parent 4ca8272efc 913e6a5709
commit 798ea75f3d
32 changed files with 210 additions and 226 deletions
@@ -1,10 +1,10 @@
 <?php
 return array (
  'app_version' => 'v4.1.10-pre',
-  'full_app_version' => 'v4.1.10-pre - build 3219-gf38dc37',
-  'build_version' => '3219',
+  'full_app_version' => 'v4.1.10-pre - build 3238-g4ca8272',
+  'build_version' => '3238',
  'prerelease_version' => '',
-  'hash_version' => 'gf38dc37',
-  'full_hash' => 'v4.1.10-pre-89-gf38dc37',
+  'hash_version' => 'g4ca8272',
+  'full_hash' => 'v4.1.10-pre-108-g4ca8272',
  'branch' => 'master',
 );