Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php
snipe · May 13, 2024 · 6823aab · 6823aab
2 parents 4642f50 + f2dddc1
commit 6823aab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/codacy-analysis.yml b/.github/workflows/codacy-analysis.yml
@@ -36,7 +36,7 @@ jobs:
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@v4.4.0
+        uses: codacy/codacy-analysis-cli-action@v4.4.1
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations

diff --git a/config/version.php b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v6.4.0',
-  'full_app_version' => 'v6.4.0 - build 13351-gdb2baae758',
-  'build_version' => '13351',
+  'app_version' => 'v6.4.1',
+  'full_app_version' => 'v6.4.1 - build 13386-g4642f50d6b',
+  'build_version' => '13386',
   'prerelease_version' => '',
-  'hash_version' => 'gdb2baae758',
-  'full_hash' => 'v6.4.0-210-gdb2baae758',
+  'hash_version' => 'g4642f50d6b',
+  'full_hash' => 'v6.4.1-31-g4642f50d6b',
   'branch' => 'master',
 );