Merge remote-tracking branch 'origin/develop'

# Conflicts: # config/version.php
bryanwills · Dec 1, 2020 · 60d269a · 60d269a
2 parents f9b1fdc + e2cb7a0
commit 60d269a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/config/version.php b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v5.0.9',
-  'full_app_version' => 'v5.0.9 - build 5616-973eacf6c3',
-  'build_version' => '5616',
+  'app_version' => 'v5.0.10',
+  'full_app_version' => 'v5.0.10 - build 5680-gf9b1fdc36',
+  'build_version' => '5680',
   'prerelease_version' => '',
-  'hash_version' => '973eacf6c3',
-  'full_hash' => 'v5.0.9-87-973eacf6c3',
+  'hash_version' => 'gf9b1fdc36',
+  'full_hash' => 'v5.0.10-21-gf9b1fdc36',
   'branch' => 'master',
 );