Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php
2025-04-02 12:50:35 +01:00
parent af408bb45f eb3dbb8c7a
commit 22d61a533d
10 changed files with 102 additions and 46 deletions
@@ -1,10 +1,10 @@
 <?php
 return array (
  'app_version' => 'v8.0.4',
-  'full_app_version' => 'v8.0.4 - build 17196-gc29bdbdac',
-  'build_version' => '17196',
+  'full_app_version' => 'v8.0.4 - build 17333-gaf408bb45',
+  'build_version' => '17333',
  'prerelease_version' => '',
-  'hash_version' => 'gc29bdbdac',
-  'full_hash' => 'v8.0.4-29-gc29bdbdac',
+  'hash_version' => 'gaf408bb45',
+  'full_hash' => 'v8.0.4-135-gaf408bb45',
  'branch' => 'master',
 );