Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]> # Conflicts: # config/version.php
snipe · Jul 5, 2022 · f148876 · f148876
2 parents acc2e12 + 2d5755c
commit f148876
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' => 'v6.0.6',
-  'full_app_version' => 'v6.0.6 - build 8300-gdf1e2687d',
-  'build_version' => '8300',
+  'app_version' => 'v6.0.7',
+  'full_app_version' => 'v6.0.7 - build 8351-gacc2e12f1',
+  'build_version' => '8351',
   'prerelease_version' => '',
-  'hash_version' => 'gdf1e2687d',
-  'full_hash' => 'v6.0.6-172-gdf1e2687d',
+  'hash_version' => 'gacc2e12f1',
+  'full_hash' => 'v6.0.7-42-gacc2e12f1',
   'branch' => 'master',
 );